diff --git a/.vscode-mac.keybindings.json b/.vscode-mac.keybindings.json index ebddfe5f..9cd4dd40 100644 --- a/.vscode-mac.keybindings.json +++ b/.vscode-mac.keybindings.json @@ -355,10 +355,6 @@ "key": "shift+cmd+e", "command": "workbench.explorer.fileView.focus" }, - { - "key": "ctrl+cmd+r", - "command": "godot-tool.run_project" - }, { "key": "ctrl+shift+\\", "command": "workbench.action.openQuickChat.copilot" @@ -390,11 +386,15 @@ { "key": "ctrl+shift+cmd+r", "command": "workbench.action.reloadWindow", - "when": "isDevelopment" + "when": "false" }, { "key": "cmd+r", "command": "-workbench.action.reloadWindow", "when": "isDevelopment" + }, + { + "key": "ctrl+cmd+r", + "command": "typescript.restartTsServer" } ] diff --git a/.vscode-mac.settings.json b/.vscode-mac.settings.json index 45d8a132..cd562633 100644 --- a/.vscode-mac.settings.json +++ b/.vscode-mac.settings.json @@ -1,4 +1,8 @@ { + "python.formatting.provider": "black", + "[python]": { + "editor.defaultFormatter": "ms-python.python" + }, "[html]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, @@ -100,6 +104,7 @@ "terminal.integrated.fontWeightBold": "normal", "typescript.disableAutomaticTypeAcquisition": true, "typescript.updateImportsOnFileMove.enabled": "always", + "typescript.tsdk": "node_modules/typescript/lib", "vim.foldfix": false, "vim.leader": ",", "vim.neovimPath": "/opt/homebrew/bin/nvim", @@ -183,11 +188,9 @@ } }, "outline.collapseItems": "alwaysCollapse", - "typescript.tsserver.experimental.enableProjectDiagnostics": true, "[jsonc]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "window.density.editorTabHeight": "compact", "workbench.activityBar.location": "hidden", "godot_tools.editor_path": "/Applications/Godot.app/Contents/MacOS/Godot", "workbench.editor.tabActionCloseVisibility": false, @@ -202,12 +205,16 @@ "images/${fileName}": "" }, "files.trimTrailingWhitespace": true, - "typescript.autoClosingTags": false, "debug.onTaskErrors": "showErrors", "godotTools.editorPath.godot3": "/Applications/Godot.app/Contents/MacOS/Godot", "godotTools.editorPath.godot4": "/Applications/Godot.app/Contents/MacOS/Godot", "github.copilot.editor.enableAutoCompletions": true, "arduino.logLevel": "verbose", "arduino.path": "/opt/homebrew/bin/arduino-cli", - "arduino.commandPath": "/opt/homebrew/bin/arduino-cli" + "arduino.commandPath": "/opt/homebrew/bin/arduino-cli", + "workbench.editor.wrapTabs": true, + "window.density.editorTabHeight": "compact", + "typescript.tsserver.maxTsServerMemory": 15000, + "typescript.tsserver.log": "off", + "typescript.tsserver.web.typeAcquisition.enabled": false }