diff --git a/editor/sublime/plugin.py b/editor/sublime/plugin.py index 53110fa..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": view.settings().get("sublimeclang_options", []), - "net_paths":view.settings().get("net_paths", []), - "net_assemblies":view.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