- fix typo in constant.numeric.line-number.csearch

- add hotkey to invoke code search. Hotkey is `alt-super-shift-f`
(not `alt-super-shift-s` as in SublimeCodeSearch project) as if it's an
"extension" to normal "find in files" `super-shift-f`
- add handling of double clicks within search results to open target file.
That might conflict with other extensions trying to mimic "Find in files"
double click behaviour. I blame Jon Skinner.
- updated captions of commands to better explain what they do
- add handling of paths relative to project root
- fix searching for qouted text: now qoutes are not passed along
- removed TODO: now we handle missing closing qoute assuming it is at very end
- updated default search prompt to `file:* case:yes "` to:
-- showcase `file` and `case` options
-- be able to simply paste multi-word search (you had to add quotas before
otherwise it searches for `(multi-word|search)`)
- fix handling of windows paths: parser failed to process paths with colons
rendering plugin unuseful on windows
- removed throwing an error when index file does not exist: you had to run
cindex manually to bootstrap project index. cindex can create new files
with ease
- add log to console how much time it took to index

Author: metaflow

.travis.yml

@@ -6,8 +6,7 @@ install:
     - sudo add-apt-repository ppa:webupd8team/sublime-text-3 -y
     - sudo apt-get update
     - sudo apt-get install sublime-text-installer golang -y
-    - go get code.google.com/p/codesearch/cmd/cindex
-    - go get code.google.com/p/codesearch/cmd/csearch
+    - go get github.com/google/codesearch/cmd/...
     - mkdir -p $HOME/.config/sublime-text-3/Packages
     - ln -s $PWD $HOME/.config/sublime-text-3/Packages/YetAnotherCodeSearch
     - git clone --branch 0.4.3 https://github.com/randy3k/UnitTesting $HOME/.config/sublime-text-3/Packages/UnitTesting

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")