Merge pull request #211 from mtxr/feature/completions-selectors

 Add a setting to disable completion for selectors

Author: tkopets

SQLTools.py

@@ -456,21 +456,19 @@ def on_query_completions(view, prefix, locations):
         if not len(locations):
             return None
 
-        # disable completions inside strings
-        if view.match_selector(locations[0], 'string'):
-            return None
+        ignoreSelectors = ST.completion.getIgnoreSelectors()
+        if ignoreSelectors:
+            for selector in ignoreSelectors:
+                if view.match_selector(locations[0], selector):
+                    return None
 
-        # show completions only for specific selectors
-        selectors = ST.completion.getSelectors()
-        selectorMatched = False
-        if selectors:
-            for selector in selectors:
+        activeSelectors = ST.completion.getActiveSelectors()
+        if activeSelectors:
+            for selector in activeSelectors:
                 if view.match_selector(locations[0], selector):
-                    selectorMatched = True
                     break
-
-        if not selectorMatched:
-            return None
+            else:
+                return None
 
         # sublimePrefix = prefix
         # sublimeCompletions = view.extract_completions(sublimePrefix, locations[0])

SQLTools.sublime-settings

@@ -87,17 +87,28 @@
     },
 
     /**
-     * The list of syntax selectors for which the plugin autocompletion will be active.
+     * The list of syntax selectors for which the autocompletion will be active.
      * An empty list means autocompletion always active.
      */
-    "selectors": [
+    "autocomplete_selectors_active": [
         "source.sql",
         "source.pgsql",
         "source.plpgsql.postgres",
         "source.plsql.oracle",
         "source.tsql"
     ],
 
+    /**
+     * The list of syntax selectors for which the autocompletion will be disabled.
+     */
+    "autocomplete_selectors_ignore": [
+        "string.quoted.single.sql",
+        "string.quoted.single.pgsql",
+        "string.quoted.single.postgres",
+        "string.quoted.single.oracle",
+        "string.group.quote.oracle"
+    ],
+
     /**
      * Command line interface options for each RDBMS.
      * In this file, the section `cli` above has the names you can use here.

SQLToolsAPI/Completion.py

@@ -172,8 +172,17 @@ def __init__(self, allTables, allColumns, allFunctions, settings=None):
         if settings is None:
             settings = {}
 
-        # get completion selectors from settings
-        self.selectors = settings.get('selectors', [])
+        # check old setting name ('selectors') first for compatibility
+        activeSelectors = settings.get('selectors', None)
+        if not activeSelectors:
+            activeSelectors = settings.get(
+                'autocomplete_selectors_active',
+                ['source.sql'])
+        self.activeSelectors = activeSelectors
+
+        self.ignoreSelectors = settings.get(
+            'autocomplete_selectors_ignore',
+            ['string.quoted.single.sql'])
 
         # determine type of completions
         self.completionType = settings.get('autocompletion', 'smart')
@@ -198,8 +207,11 @@ def __init__(self, allTables, allColumns, allFunctions, settings=None):
 
             self.allKeywords.append(CompletionItem('Keyword', keyword))
 
-    def getSelectors(self):
-        return self.selectors
+    def getActiveSelectors(self):
+        return self.activeSelectors
+
+    def getIgnoreSelectors(self):
+        return self.ignoreSelectors
 
     def isDisabled(self):
         return self.completionType is None