Merge pull request #74 from k--kato/#54/find_in_files

#54/find in files
kasecato · May 26, 2017 · 5014c06 · 5014c06
2 parents b133f09 + 4c53106
commit 5014c06
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 0.2.11 (May 27, 2017)
 
 * enhancement - ctrl+s bug. See [#52](https://github.com/k--kato/vscode-intellij-idea-keybindings/issues/52).
+* enhancement - “find in files” shortcut doesn't works. See [#54](https://github.com/k--kato/vscode-intellij-idea-keybindings/issues/54).
 
 ## 0.2.10 (March 3, 2017)
 

diff --git a/package.json b/package.json
@@ -496,6 +496,7 @@
                 "key": "ctrl+shift+f",
                 "mac": "cmd+shift+f",
                 "command": "workbench.view.search",
+                "when": "!searchViewletVisible",
                 "intellij": "Find in path"
             },
             {

diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -496,6 +496,7 @@
                 "key": "ctrl+shift+f",
                 "mac": "cmd+shift+f",
                 "command": "workbench.view.search",
+                "when": "!searchViewletVisible",
                 "intellij": "Find in path"
             },
             {
@@ -1518,4 +1519,4 @@
             }
         ]
     }
-}
+}