Merge pull request #8 from metaflow/misc

Misc fixes from @metaflow.

- Fixed some typos
- Can double click on search results to take you to line number
- More context in status line
- Default prompt shows `file:* case:yes`
- Corrected quoting bug
- Corrected Windows path handling bugs
- File paths relative to project

See #8 for full context.

Author: pope

Code Search Results.YAML-tmLanguage

@@ -12,7 +12,7 @@ patterns:
 
 - match: '^ +([0-9]+) '
   captures:
-    '1': {name: constant.numeric.line-number.cearch}
+    '1': {name: constant.numeric.line-number.csearch}
 
 - match: '^ +([0-9]+):'
   captures:

Code Search Results.hidden-tmLanguage

@@ -26,7 +26,7 @@
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>constant.numeric.line-number.cearch</string>
+					<string>constant.numeric.line-number.csearch</string>
 				</dict>
 			</dict>
 			<key>match</key>

Default (Linux).sublime-mousemap

@@ -0,0 +1,8 @@
+[
+	{
+		"button": "button1", "count": 2,
+		"press_command": "drag_select",
+		"press_args": {"by": "words"},
+		"command": "double_click_callback"
+	},
+]

Default (OSX).sublime-mousemap

@@ -0,0 +1,8 @@
+[
+	{
+		"button": "button1", "count": 2,
+		"press_command": "drag_select",
+		"press_args": {"by": "words"},
+		"command": "double_click_callback"
+	},
+]

Default (Windows).sublime-mousemap

@@ -0,0 +1,8 @@
+[
+	{
+		"button": "button1", "count": 2,
+		"press_command": "drag_select",
+		"press_args": {"by": "words"},
+		"command": "double_click_callback"
+	},
+]

Default.sublime-commands

@@ -4,11 +4,11 @@
     "command": "csearch"
   },
   {
-    "caption": "Code Search Index",
+    "caption": "Code Search: Refresh Index",
     "command": "cindex"
   },
   {
-    "caption": "Code Search Index Project",
+    "caption": "Code Search: Create New Index from Project Settings",
     "command": "cindex",
     "args": {
       "index_project": true

README.md

@@ -107,6 +107,9 @@ specific `YetAnotherCodeSearch.sublime-settings` file. See the default file
 for configuration options. Both are easily found via
 *Preferences > Package Settings > YetAnotherCodeSearch*.
 
+To add keyboard shortcut open Preferences > Key Bindings - User and add
+something like `{ "keys": ["alt+ctrl+shift+f"], "command": "csearch" }`.
+
 ### Project Settings
 
 You can specify an index file to use for the project by editing the project

cindex.py

@@ -64,6 +64,7 @@ def run(self, index_project=False):
         try:
             s = settings.get_project_settings(
                 self.window.project_data(),
+                self.window.project_file_name(),
                 index_project_folders=index_project)
             _CindexListThread(self,
                               path_cindex=s.cindex_path,
@@ -143,6 +144,8 @@ def _start_indexing(self):
             cmd.append('-reset')
             cmd.extend(self._paths_to_index)
         proc = self._get_proc(cmd)
+        overall_start = time.perf_counter()
+        total_count = 0
         start = time.time()
         count = 0
         for line in iter(proc.stdout.readline, b''):
@@ -153,9 +156,13 @@ def _start_indexing(self):
             tick = time.time()
             if tick - start > .1:
                 self._listener.on_files_processed(count)
+                total_count += count
                 count = 0
                 start = tick
+        total_count += count
         self._listener.on_files_processed(count)
+        print('Code Search: indexed {0} files in {1:.3f}s'.format(
+              total_count, time.perf_counter() - overall_start))
         proc.stdout.close()
         retcode = proc.poll()
         if retcode:

csearch.py

@@ -5,6 +5,8 @@
 import functools
 import operator
 import os
+import platform
+import re
 import subprocess
 import threading
 
@@ -31,7 +33,7 @@ class CsearchCommand(sublime_plugin.WindowCommand, _CsearchListener):
     def __init__(self, *args, **kwargs):
         super(CsearchCommand, self).__init__(*args, **kwargs)
         self._is_running = False
-        self._last_search = ''
+        self._last_search = 'file:* case:yes "'
 
     def run(self, query=None):
         """Runs the search command.
@@ -73,7 +75,8 @@ def _on_search(self, result):
                             view=view, erase=True)
         view.set_status('YetAnotherCodeSearch', 'Searching...')
         try:
-            s = settings.get_project_settings(self.window.project_data())
+            s = settings.get_project_settings(self.window.project_data(),
+                                              self.window.project_file_name())
             _CsearchThread(parser.parse_query(result), self,
                            path_csearch=s.csearch_path,
                            index_filename=s.index_filename).start()
@@ -143,6 +146,23 @@ def on_finished(self, output, err=None):
             functools.partial(self._finish, output, matches, err=err))
 
 
+def fix_windows_output(output):
+    """Normalize file paths in csearch output on windows platform."""
+
+    result = []
+    # replace ntpaths to posix
+    r = re.compile(r"^([^:]*):([^:]*):([^:]*):(.*)$")
+    for line in output.splitlines():
+        m = r.match(line)
+        if m:
+            line = '/{0}{1}:{2}:{3}'.format(m.group(1),
+                                            m.group(2).replace('\\', '/'),
+                                            m.group(3),
+                                            m.group(4))
+        result.append(line)
+    return '\n'.join(result)
+
+
 class _CsearchThread(threading.Thread):
     """Runs the csearch command in a thread."""
 
@@ -182,7 +202,10 @@ def _do_search(self):
             error = subprocess.CalledProcessError(retcode, cmd)
             error.output = stderr
             raise error
-        return output.decode('utf-8')
+        u8 = output.decode('utf-8')
+        if platform.system() == 'Windows':
+            return fix_windows_output(u8)
+        return u8
 
 
 class CodeSearchResultsGoToFileCommand(sublime_plugin.WindowCommand):
@@ -217,3 +240,8 @@ def run(self):
         self.window.open_file('{0}:{1}:{2}'.format(filename, linenum, col),
                               sublime.ENCODED_POSITION)
         # TODO(pope): Consider highlighting the match
+
+
+class DoubleClickCallback(sublime_plugin.WindowCommand):
+    def run(self):
+        self.window.run_command("code_search_results_go_to_file")

parser.py

@@ -51,16 +51,17 @@ def _search_quote_state(lex):
     Returns:
         The next lex state.
     """
-    # TODO(pope): Handle the error case when we try to leave without seeing a
-    # closing quote.
     while True:
         lex.acceptRunIgnoring('\\"')
         c = lex.next()
         if c == '\\':
             lex.next()  # Advance over whatever is being escaped.
-        else:
+        elif c == '"':
+            lex.emit('quote')
+            break
+        else:  # end
+            lex.emitValue('quote', lex.curstr() + '"')
             break
-    lex.emit('quote')
     return _search_text_state
 
 
@@ -184,12 +185,22 @@ def hasstr(self):
         return self._pos > self._start
 
     def emit(self, tokType):
-        """Emit appends the current string to the list of tokens.
+        """Emit appends the current string to the list of tokens and advances
+        position.
+
+        Args:
+            tokType: The token type describing the current string.
+        """
+        self.emitValue(tokType, self.curstr())
+
+    def emitValue(self, tokType, value):
+        """Emit appends value to the list of tokens and advances position.
 
         Args:
             tokType: The token type describing the current string.
+            value: value of token.
         """
-        self._tokens.append((tokType, self.curstr()))
+        self._tokens.append((tokType, value))
         self._start = self._pos
 
     def ignore(self):
@@ -344,8 +355,10 @@ def parse_query(text):
     try:
         while True:
             (tokType, tokValue) = next(tokens)
-            if tokType in ('text', 'quote'):
+            if tokType == 'text':
                 res.query.append(tokValue)
+            elif tokType == 'quote':
+                res.query.append(tokValue[1:-1])
             elif tokType == 'flag':
                 flag = tokValue.lower()
                 (ignore_type, value) = next(tokens)
@@ -355,7 +368,8 @@ def parse_query(text):
                     else:
                         res.case = True
                 elif flag == 'file':
-                    res.file = value
+                    if value != '*':
+                        res.file = value
                 else:
                     raise Exception('Unsupported flag value: {0}'.format(flag))
             else: