From 1859c050b240dbd38823bd7e31d8c2599e251fc8 Mon Sep 17 00:00:00 2001 From: Lance Jordan Date: Sat, 27 Apr 2019 11:26:37 -0400 Subject: [PATCH 1/3] default search to project path Fix #6 This fixes bug which gave no results unless you enter . in the path to search. Working with the_platinum_searcher. the_silver_searcher was at this point already broken. --- lib/search-instance.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/search-instance.js b/lib/search-instance.js index 2e70086..980845c 100644 --- a/lib/search-instance.js +++ b/lib/search-instance.js @@ -88,8 +88,10 @@ class SearchInstance { getSearchPaths(join) { let projectPaths = atom.project.getPaths(); let searchPaths = this.options && this.options.paths || []; - if (!searchPaths || !searchPaths.length) { - return projectPaths; + if (!searchPaths || searchPaths[0] == [""]) { + for (let i of projectPaths) { + searchPaths.push(i); + } } let foundPaths = []; searchPaths.forEach(searchPath => { From 83433b7d0c04cacf7d79c9a7cee09a89841ddb32 Mon Sep 17 00:00:00 2001 From: Lance Jordan Date: Sun, 28 Apr 2019 07:23:46 -0400 Subject: [PATCH 2/3] get silver search working --- lib/search-instance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/search-instance.js b/lib/search-instance.js index 980845c..6f05cc8 100644 --- a/lib/search-instance.js +++ b/lib/search-instance.js @@ -33,7 +33,7 @@ class SearchInstance { runSearch() { let flags = SearchEnv.opts; - if (SearchEnv.engine !== 'pt') { + if (SearchEnv.engine !== 'pt' && SearchEnv.engine !== 'ag' ) { flags.push('-n'); } if (this.regex.ignoreCase) { From 2e1104d6159d0f5e9e7ca537239b1c0340b219f7 Mon Sep 17 00:00:00 2001 From: Lance Jordan Date: Sun, 28 Apr 2019 09:22:33 -0400 Subject: [PATCH 3/3] fix csearch path bug in last commit --- lib/search-instance.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/search-instance.js b/lib/search-instance.js index 6f05cc8..11cf350 100644 --- a/lib/search-instance.js +++ b/lib/search-instance.js @@ -88,9 +88,13 @@ class SearchInstance { getSearchPaths(join) { let projectPaths = atom.project.getPaths(); let searchPaths = this.options && this.options.paths || []; - if (!searchPaths || searchPaths[0] == [""]) { - for (let i of projectPaths) { - searchPaths.push(i); + if (!searchPaths || searchPaths[0] == "") { + searchPaths = [] + for (let path of projectPaths) { + if ( path[path.length-1] != '/') { + path = SearchEnv.engine !='csearch' ? path + '/' : path; + searchPaths.push(path); + } } } let foundPaths = [];