window.project_data() can return None. Fixes #153

sublimelsp · Oct 6, 2017 · 740b57d · 740b57d
1 parent d3a8da3
commit 740b57d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/main.py b/main.py
@@ -776,7 +776,7 @@ def get_default_client_config(view: sublime.View) -> 'Optional[ClientConfig]':
 
 
 def enable_in_project(window, config_name: str) -> None:
-    project_data = window.project_data()
+    project_data = window.project_data() or dict()
     project_settings = project_data.setdefault('settings', dict())
     project_lsp_settings = project_settings.setdefault('LSP', dict())
     project_client_settings = project_lsp_settings.setdefault(config_name, dict())
@@ -785,7 +785,7 @@ def enable_in_project(window, config_name: str) -> None:
 
 
 def disable_in_project(window, config_name: str) -> None:
-    project_data = window.project_data()
+    project_data = window.project_data() or dict()
     project_settings = project_data.setdefault('settings', dict())
     project_lsp_settings = project_settings.setdefault('LSP', dict())
     project_client_settings = project_lsp_settings.setdefault(config_name, dict())
@@ -794,7 +794,7 @@ def disable_in_project(window, config_name: str) -> None:
 
 
 def get_project_config(window: sublime.Window) -> dict:
-    project_data = window.project_data()
+    project_data = window.project_data() or dict()
     project_settings = project_data.setdefault('settings', dict())
     project_lsp_settings = project_settings.setdefault('LSP', dict())
     return project_lsp_settings

diff --git a/stubs/sublime.pyi b/stubs/sublime.pyi
@@ -156,7 +156,7 @@ class Window:
     def set_menu_visible(self, flag: bool) -> None: ...
     def folders(self) -> List[str]: ...
     def project_file_name(self) -> str: ...
-    def project_data(self) -> dict: ...
+    def project_data(self) -> Optional[dict]: ...
     def set_project_data(self, v: dict) -> None: ...
     def settings(self) -> Settings: ...
     def template_settings(self): ...