clean up conflicts in vscode keybindings and vs extension

synle · Jul 30, 2023 · 3d2f8fa · 3d2f8fa
1 parent 33caeee
commit 3d2f8fa
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/.build/vs-code-extensions-macosx b/.build/vs-code-extensions-macosx
@@ -1,9 +1,6 @@
-
 cd "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/"
 ./code --install-extension aaron-bond.better-comments --force
 ./code --install-extension andrejunges.Handlebars --force
-./code --install-extension bierner.folder-source-actions --force
-./code --install-extension christian-kohler.npm-intellisense --force
 ./code --install-extension christian-kohler.path-intellisense --force
 ./code --install-extension clinyong.vscode-css-modules --force
 ./code --install-extension dakara.transformer --force
@@ -12,22 +9,33 @@ cd "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/"
 ./code --install-extension dsznajder.es7-react-js-snippets --force
 ./code --install-extension emmanuelbeziat.vscode-great-icons --force
 ./code --install-extension esbenp.prettier-vscode --force
+./code --install-extension formulahendry.auto-rename-tag --force
 ./code --install-extension Hridoy.ember-snippets --force
 ./code --install-extension ms-azuretools.vscode-docker --force
 ./code --install-extension ms-dotnettools.csharp --force
+./code --install-extension ms-python.isort --force
 ./code --install-extension ms-python.python --force
 ./code --install-extension ms-python.vscode-pylance --force
-./code --install-extension ms-vscode-remote.remote-containers --force
 ./code --install-extension ms-vscode-remote.remote-ssh --force
 ./code --install-extension ms-vscode-remote.remote-ssh-edit --force
 ./code --install-extension ms-vscode-remote.remote-wsl --force
-./code --install-extension ms-vscode-remote.vscode-remote-extensionpack --force
 ./code --install-extension ms-vscode.cpptools --force
+./code --install-extension ms-vscode.remote-explorer --force
 ./code --install-extension nicoespeon.abracadabra --force
-./code --install-extension NuclleaR.vscode-extension-auto-import --force
 ./code --install-extension oderwat.indent-rainbow --force
+./code --install-extension PKief.material-icon-theme --force
+./code --install-extension redhat.java --force
+./code --install-extension redhat.vscode-yaml --force
 ./code --install-extension scala-lang.scala --force
 ./code --install-extension streetsidesoftware.code-spell-checker --force
+./code --install-extension VisualStudioExptTeam.intellicode-api-usage-examples --force
+./code --install-extension VisualStudioExptTeam.vscodeintellicode --force
+./code --install-extension vscjava.vscode-java-debug --force
+./code --install-extension vscjava.vscode-java-dependency --force
+./code --install-extension vscjava.vscode-java-pack --force
+./code --install-extension vscjava.vscode-java-test --force
 ./code --install-extension vscjava.vscode-maven --force
+./code --install-extension vscode-icons-team.vscode-icons --force
+./code --install-extension wholroyd.jinja --force
 ./code --install-extension wmaurer.change-case --force
-./code --install-extension formulahendry.auto-rename-tag --force
+./code --install-extension xabikos.JavaScriptSnippets --force
diff --git a/.build/vs-code-extensions-windows b/.build/vs-code-extensions-windows
@@ -1,9 +1,6 @@
-
 c:; cd "C:/Program Files/Microsoft VS Code/bin"
 ./code --install-extension aaron-bond.better-comments --force
 ./code --install-extension andrejunges.Handlebars --force
-./code --install-extension bierner.folder-source-actions --force
-./code --install-extension christian-kohler.npm-intellisense --force
 ./code --install-extension christian-kohler.path-intellisense --force
 ./code --install-extension clinyong.vscode-css-modules --force
 ./code --install-extension dakara.transformer --force
@@ -12,22 +9,33 @@ c:; cd "C:/Program Files/Microsoft VS Code/bin"
 ./code --install-extension dsznajder.es7-react-js-snippets --force
 ./code --install-extension emmanuelbeziat.vscode-great-icons --force
 ./code --install-extension esbenp.prettier-vscode --force
+./code --install-extension formulahendry.auto-rename-tag --force
 ./code --install-extension Hridoy.ember-snippets --force
 ./code --install-extension ms-azuretools.vscode-docker --force
 ./code --install-extension ms-dotnettools.csharp --force
+./code --install-extension ms-python.isort --force
 ./code --install-extension ms-python.python --force
 ./code --install-extension ms-python.vscode-pylance --force
-./code --install-extension ms-vscode-remote.remote-containers --force
 ./code --install-extension ms-vscode-remote.remote-ssh --force
 ./code --install-extension ms-vscode-remote.remote-ssh-edit --force
 ./code --install-extension ms-vscode-remote.remote-wsl --force
-./code --install-extension ms-vscode-remote.vscode-remote-extensionpack --force
 ./code --install-extension ms-vscode.cpptools --force
+./code --install-extension ms-vscode.remote-explorer --force
 ./code --install-extension nicoespeon.abracadabra --force
-./code --install-extension NuclleaR.vscode-extension-auto-import --force
 ./code --install-extension oderwat.indent-rainbow --force
+./code --install-extension PKief.material-icon-theme --force
+./code --install-extension redhat.java --force
+./code --install-extension redhat.vscode-yaml --force
 ./code --install-extension scala-lang.scala --force
 ./code --install-extension streetsidesoftware.code-spell-checker --force
+./code --install-extension VisualStudioExptTeam.intellicode-api-usage-examples --force
+./code --install-extension VisualStudioExptTeam.vscodeintellicode --force
+./code --install-extension vscjava.vscode-java-debug --force
+./code --install-extension vscjava.vscode-java-dependency --force
+./code --install-extension vscjava.vscode-java-pack --force
+./code --install-extension vscjava.vscode-java-test --force
 ./code --install-extension vscjava.vscode-maven --force
+./code --install-extension vscode-icons-team.vscode-icons --force
+./code --install-extension wholroyd.jinja --force
 ./code --install-extension wmaurer.change-case --force
-./code --install-extension formulahendry.auto-rename-tag --force
+./code --install-extension xabikos.JavaScriptSnippets --force
diff --git a/.build/vs-code-keybindings-linux b/.build/vs-code-keybindings-linux
@@ -56,7 +56,7 @@
     "command": "workbench.action.toggleSidebarVisibility"
   },
   {
-    "key": "alt+alt+\\",
+    "key": "alt+shift+\\",
     "command": "workbench.action.toggleActivityBarVisibility"
   },
   {
@@ -81,10 +81,6 @@
     "command": "editor.action.insertCursorAtEndOfEachLineSelected",
     "when": "editorTextFocus"
   },
-  {
-    "key": "alt+shift+\\",
-    "command": "workbench.view.explorer"
-  },
   {
     "key": "alt+shift+'",
     "command": "workbench.action.showAllSymbols"

diff --git a/.build/vs-code-keybindings-macosx b/.build/vs-code-keybindings-macosx
@@ -56,7 +56,7 @@
     "command": "workbench.action.toggleSidebarVisibility"
   },
   {
-    "key": "cmd+alt+\\",
+    "key": "cmd+shift+\\",
     "command": "workbench.action.toggleActivityBarVisibility"
   },
   {
@@ -81,10 +81,6 @@
     "command": "editor.action.insertCursorAtEndOfEachLineSelected",
     "when": "editorTextFocus"
   },
-  {
-    "key": "cmd+shift+\\",
-    "command": "workbench.view.explorer"
-  },
   {
     "key": "cmd+shift+'",
     "command": "workbench.action.showAllSymbols"

diff --git a/.build/vs-code-keybindings-windows b/.build/vs-code-keybindings-windows
@@ -56,7 +56,7 @@
     "command": "workbench.action.toggleSidebarVisibility"
   },
   {
-    "key": "alt+alt+\\",
+    "key": "alt+shift+\\",
     "command": "workbench.action.toggleActivityBarVisibility"
   },
   {
@@ -81,10 +81,6 @@
     "command": "editor.action.insertCursorAtEndOfEachLineSelected",
     "when": "editorTextFocus"
   },
-  {
-    "key": "alt+shift+\\",
-    "command": "workbench.view.explorer"
-  },
   {
     "key": "alt+shift+'",
     "command": "workbench.action.showAllSymbols"

diff --git a/software/scripts/vs-code-keybindings.js b/software/scripts/vs-code-keybindings.js
@@ -56,7 +56,7 @@ async function doInit() {
       command: 'workbench.action.toggleSidebarVisibility',
     }, // toggle just the explorer part
     {
-      key: 'OS_KEY+alt+\\',
+      key: 'OS_KEY+shift+\\',
       command: 'workbench.action.toggleActivityBarVisibility',
     }, // toggle just the activity tiny strip
     {
@@ -81,10 +81,6 @@ async function doInit() {
       command: 'editor.action.insertCursorAtEndOfEachLineSelected',
       when: 'editorTextFocus',
     },
-    {
-      key: 'OS_KEY+shift+\\',
-      command: 'workbench.view.explorer',
-    },
     {
       key: "OS_KEY+shift+'",
       command: 'workbench.action.showAllSymbols',