Revert "I guess we already had compatibility?"

This reverts commit 8040cb5.
sublimelsp · Jun 26, 2021 · 8f8c394 · 8f8c394
1 parent 2fa323d
commit 8f8c394
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/plugin/session_buffer.py b/plugin/session_buffer.py
@@ -62,7 +62,7 @@ class SessionBuffer:
     dynamically registered capabilities applicable to this particular buffer.
     """
 
-    def __init__(self, session_view: SessionViewProtocol, buffer_id: int, uri: DocumentUri) -> None:
+    def __init__(self, session_view: SessionViewProtocol, buffer_id: int, language_id: str, uri: DocumentUri) -> None:
         view = session_view.view
         self.opened = False
         # Every SessionBuffer has its own personal capabilities due to "dynamic registration".
@@ -71,6 +71,7 @@ def __init__(self, session_view: SessionViewProtocol, buffer_id: int, uri: Docum
         self.session_views = WeakSet()  # type: WeakSet[SessionViewProtocol]
         self.session_views.add(session_view)
         self.uri = uri
+        self.language_id = language_id
         self.id = buffer_id
         self.pending_changes = None  # type: Optional[PendingChanges]
         self.diagnostics = []  # type: List[Tuple[Diagnostic, sublime.Region]]
@@ -99,11 +100,7 @@ def __del__(self) -> None:
 
     def _check_did_open(self, view: sublime.View) -> None:
         if not self.opened and self.should_notify_did_open():
-            language_id = self.get_language_id()
-            if not language_id:
-                # we're closing
-                return
-            self.session.send_notification(did_open(view, language_id))
+            self.session.send_notification(did_open(view, self.language_id))
             self.opened = True
 
     def _check_did_close(self) -> None:
@@ -123,9 +120,7 @@ def get_language_id(self) -> Optional[str]:
 
     @property
     def language_id(self) -> str:
-        """
-        Deprecated: use get_language_id
-        """
+        """Deprecated: use get_language_id"""
         return self.get_language_id() or ""
 
     def add_session_view(self, sv: SessionViewProtocol) -> None:

diff --git a/plugin/session_view.py b/plugin/session_view.py
@@ -48,7 +48,7 @@ def __init__(self, listener: AbstractViewListener, session: Session, uri: Docume
         key = (session.config.name, session.window.id(), buffer_id)
         session_buffer = self._session_buffers.get(key)
         if session_buffer is None:
-            session_buffer = SessionBuffer(self, buffer_id, uri)
+            session_buffer = SessionBuffer(self, buffer_id, listener.get_language_id(), uri)
             self._session_buffers[key] = session_buffer
         else:
             session_buffer.add_session_view(self)