Merge pull request #156 from mtxr/fix-completions-with-dollar-sign

Fix completions for identifiers with dollar sign

Author: tkopets

SQLTools.py

@@ -368,7 +368,7 @@ def on_query_completions(view, prefix, locations):
         lineStartToLocation = sublime.Region(lineStartPoint, currentPoint)
         try:
             lineStr = view.substr(lineStartToLocation)
-            prefix = re.split('[^`\"\w.]+', lineStr).pop()
+            prefix = re.split('[^`\"\w.\$]+', lineStr).pop()
         except Exception as e:
             Log(e)
 

SQLToolsAPI/Completion.py

@@ -39,6 +39,11 @@ def _stripPrefix(text, prefix):
     return text
 
 
+# escape $ sign when formatting output
+def _escapeDollarSign(ident):
+    return ident.replace("$", "\$")
+
+
 class CompletionItem(namedtuple('CompletionItem', ['type', 'ident'])):
     """
     Represents a potential or actual completion item.
@@ -149,10 +154,10 @@ def format(self, stripQuotes=False):
         part = self.ident.split('.')
         if len(part) > 1:
             return ("{0}\t({1} {2})".format(part[1], part[0], typeDisplay),
-                    _stripQuotesOnDemand(part[1], stripQuotes))
+                    _stripQuotesOnDemand(_escapeDollarSign(part[1]), stripQuotes))
 
         return ("{0}\t({1})".format(self.ident, typeDisplay),
-                _stripQuotesOnDemand(self.ident, stripQuotes))
+                _stripQuotesOnDemand(_escapeDollarSign(self.ident), stripQuotes))
 
 
 class Completion: