From fb3b40df12d8bc4c20a183c3ca95c7bcfec7df8e Mon Sep 17 00:00:00 2001 From: Mitchell-Riley Date: Tue, 8 Sep 2015 09:35:13 -0400 Subject: [PATCH 1/2] Use completion settings, not Preferences Preferences.sublime-settings was previously used for completion variables. It makes more sense to use completion.sublime-settings. --- editor/sublime/plugin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editor/sublime/plugin.py b/editor/sublime/plugin.py index 53110fa..57fbabe 100644 --- a/editor/sublime/plugin.py +++ b/editor/sublime/plugin.py @@ -189,9 +189,9 @@ def prepare_request(view, prefix, locations, settings): "SessionOverrides": { # TODO: what would be a good way to handle this? Query the "driver" for which options are configurable? # TODO: Sessions should be used when possible to avoid sending the same configuration all the time. - "compiler_flags": view.settings().get("sublimeclang_options", []), - "net_paths":view.settings().get("net_paths", []), - "net_assemblies":view.settings().get("net_assemblies", []), + "compiler_flags": settings.get("sublimeclang_options", []), + "net_paths":settings.get("net_paths", []), + "net_assemblies":settings.get("net_assemblies", []), } } if view.is_dirty(): From a1c5205b0e184addf3e724a9fd175ed93df8819b Mon Sep 17 00:00:00 2001 From: Mitchell-Riley Date: Tue, 15 Sep 2015 16:04:22 -0400 Subject: [PATCH 2/2] Allow the use of sublime-project settings --- editor/sublime/plugin.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/editor/sublime/plugin.py b/editor/sublime/plugin.py index 57fbabe..a7b407f 100644 --- a/editor/sublime/plugin.py +++ b/editor/sublime/plugin.py @@ -157,6 +157,9 @@ def get_language(view, caret): return None return language.group(0) +def get_setting(view, settings, key, default=[]): + return view.settings().get(key, settings.get(key, default)) + def prepare_request(view, prefix, locations, settings): if proxy == None: make_proxy() @@ -189,9 +192,9 @@ def prepare_request(view, prefix, locations, settings): "SessionOverrides": { # TODO: what would be a good way to handle this? Query the "driver" for which options are configurable? # TODO: Sessions should be used when possible to avoid sending the same configuration all the time. - "compiler_flags": settings.get("sublimeclang_options", []), - "net_paths":settings.get("net_paths", []), - "net_assemblies":settings.get("net_assemblies", []), + "compiler_flags": get_setting(view, settings, "sublimeclang_options", []), + "net_paths": get_setting(view, settings, "net_paths", []), + "net_assemblies": get_setting(view, settings, "net_assemblies", []), } } if view.is_dirty(): @@ -214,7 +217,6 @@ def exec_goto(driver, args): sublime.status_message("definition not found!") print(response) - class CompletionGotoDefinitionCommand(sublime_plugin.TextCommand): def __init__(self, view): self.view = view