Fix merge conflicts · ian-h-chamberlain.com/dotfiles@fe2d9ad

+210 -139

Library/Application Support/Code/User/keybindings.json

··· 1 1 // Place your key bindings in this file to overwrite the defaults 2 2 [ 3 3 { 4 - "key": "alt+left", 5 4 "command": "cursorWordPartStartLeft", 6 - "when": "textInputFocus && editorLangId != 'org'" 5 + "key": "alt+left", 6 + "when": "textInputFocus" 7 7 }, 8 8 { 9 + "command": "cursorWordPartRight", 9 10 "key": "alt+right", 10 - "command": "cursorWordPartRight", 11 - "when": "textInputFocus && editorLangId != 'org'" 11 + "when": "textInputFocus" 12 12 }, 13 13 { 14 + "command": "cursorWordPartStartLeftSelect", 14 15 "key": "alt+shift+left", 15 - "command": "cursorWordPartStartLeftSelect", 16 16 "when": "textInputFocus" 17 17 }, 18 18 { 19 - "key": "alt+shift+right", 20 19 "command": "cursorWordPartRightSelect", 20 + "key": "alt+shift+right", 21 21 "when": "textInputFocus" 22 22 }, 23 23 { 24 - "key": "alt+backspace", 25 24 "command": "deleteWordPartLeft", 25 + "key": "alt+backspace", 26 26 "when": "textInputFocus" 27 27 }, 28 28 { 29 - "key": "alt+delete", 30 29 "command": "deleteWordPartRight", 30 + "key": "alt+delete", 31 31 "when": "textInputFocus" 32 32 }, 33 33 { 34 + "command": "workbench.action.nextEditorInGroup", 34 35 "key": "ctrl+tab", 35 - "command": "workbench.action.nextEditorInGroup" 36 36 }, 37 37 { 38 + "command": "-workbench.action.openNextRecentlyUsedEditorInGroup", 38 39 "key": "ctrl+tab", 39 - "command": "-workbench.action.openNextRecentlyUsedEditorInGroup" 40 40 }, 41 41 { 42 + "command": "-workbench.action.openPreviousRecentlyUsedEditorInGroup", 42 43 "key": "ctrl+shift+tab", 43 - "command": "-workbench.action.openPreviousRecentlyUsedEditorInGroup" 44 44 }, 45 45 { 46 + "command": "workbench.action.previousEditorInGroup", 46 47 "key": "ctrl+shift+tab", 47 - "command": "workbench.action.previousEditorInGroup" 48 48 }, 49 49 { 50 - "key": "alt+cmd+right", 51 - "command": "workbench.action.focusNextGroup" 52 - }, 53 - { 50 + "command": "-workbench.action.focusNextGroup", 54 51 "key": "cmd+k cmd+right", 55 - "command": "-workbench.action.focusNextGroup" 56 52 }, 57 53 { 58 - "key": "alt+cmd+left", 59 - "command": "workbench.action.focusPreviousGroup" 60 - }, 61 - { 54 + "command": "-workbench.action.focusPreviousGroup", 62 55 "key": "cmd+k cmd+left", 63 - "command": "-workbench.action.focusPreviousGroup" 64 56 }, 65 57 { 58 + "command": "-workbench.action.previousEditor", 66 59 "key": "shift+cmd+[", 67 - "command": "-workbench.action.previousEditor" 68 60 }, 69 61 { 62 + "command": "-workbench.action.nextEditor", 70 63 "key": "shift+cmd+]", 71 - "command": "-workbench.action.nextEditor" 72 64 }, 73 65 { 66 + "command": "editor.action.triggerSuggest", 74 67 "key": "alt+space", 75 - "command": "editor.action.triggerSuggest", 76 68 "when": "editorHasCompletionItemProvider && editorTextFocus && !editorReadonly" 77 69 }, 78 70 { 79 - "key": "ctrl+space", 80 71 "command": "-editor.action.triggerSuggest", 72 + "key": "ctrl+space", 81 73 "when": "editorHasCompletionItemProvider && editorTextFocus && !editorReadonly" 82 74 }, 83 75 { 84 - "key": "cmd+[", 85 76 "command": "-editor.action.outdentLines", 77 + "key": "cmd+[", 86 78 "when": "editorTextFocus && !editorReadonly" 87 79 }, 88 80 { 89 - "key": "cmd+[", 90 81 "command": "editor.fold", 82 + "key": "cmd+[", 91 83 "when": "editorTextFocus" 92 84 }, 93 85 { 94 - "key": "alt+cmd+[", 95 86 "command": "-editor.fold", 87 + "key": "alt+cmd+[", 96 88 "when": "editorTextFocus" 97 89 }, 98 90 { 99 - "key": "cmd+]", 100 91 "command": "-editor.action.indentLines", 92 + "key": "cmd+]", 101 93 "when": "editorTextFocus && !editorReadonly" 102 94 }, 103 95 { 96 + "command": "editor.unfold", 104 97 "key": "cmd+]", 105 - "command": "editor.unfold", 106 98 "when": "editorTextFocus" 107 99 }, 108 100 { 109 - "key": "alt+cmd+]", 110 101 "command": "-editor.unfold", 102 + "key": "alt+cmd+]", 111 103 "when": "editorTextFocus" 112 104 }, 113 105 { 106 + "command": "workbench.action.splitEditor", 114 107 "key": "cmd+k cmd+\\", 115 - "command": "workbench.action.splitEditor" 116 108 }, 117 109 { 110 + "command": "workbench.action.splitEditor", 118 111 "key": "cmd+k \\", 119 - "command": "workbench.action.splitEditor" 120 112 }, 121 113 { 114 + "command": "-workbench.action.splitEditor", 122 115 "key": "cmd+\\", 123 - "command": "-workbench.action.splitEditor" 124 116 }, 125 117 { 118 + "command": "workbench.action.moveEditorToNextGroup", 126 119 "key": "cmd+\\", 127 - "command": "workbench.action.moveEditorToNextGroup" 120 + "when": "!terminalFocus", 128 121 }, 129 122 { 123 + "command": "-workbench.action.closeOtherEditors", 130 124 "key": "alt+cmd+t", 131 - "command": "-workbench.action.closeOtherEditors" 132 125 }, 133 126 { 127 + "command": "workbench.action.tasks.test", 134 128 "key": "alt+cmd+t", 135 - "command": "workbench.action.tasks.test" 136 129 }, 137 130 { 138 131 "command": "workbench.action.terminal.focusNext", ··· 140 133 "when": "terminalFocus" 141 134 }, 142 135 { 143 - "key": "cmd+w", 144 136 "command": "workbench.action.terminal.kill", 137 + "key": "cmd+w", 145 138 "when": "terminalFocus" 146 139 }, 147 140 { 141 + "command": "workbench.action.terminal.focus", 148 142 "key": "ctrl+`", 149 - "command": "workbench.action.terminal.focus", 150 143 "when": "!terminalFocus" 151 144 }, 152 145 { 153 - "key": "end", 154 146 "command": "workbench.action.terminal.scrollToBottom", 147 + "key": "end", 155 148 "when": "terminalFocus" 156 149 }, 157 150 { 158 - "key": "cmd+end", 159 151 "command": "-workbench.action.terminal.scrollToBottom", 152 + "key": "cmd+end", 160 153 "when": "terminalFocus" 161 154 }, 162 155 { 163 - "key": "home", 164 156 "command": "workbench.action.terminal.scrollToTop", 157 + "key": "home", 165 158 "when": "terminalFocus" 166 159 }, 167 160 { 168 - "key": "cmd+home", 169 161 "command": "-workbench.action.terminal.scrollToTop", 162 + "key": "cmd+home", 170 163 "when": "terminalFocus" 171 164 }, 172 165 { 173 - "key": "ctrl+shift+tab", 174 166 "command": "workbench.action.terminal.focusPrevious", 167 + "key": "ctrl+shift+tab", 175 168 "when": "terminalFocus" 176 169 }, 177 170 { 178 - "key": "cmd+p", 179 - "command": "workbench.action.showAllSymbols" 171 + "command": "workbench.action.showAllSymbols", 172 + "key": "shift+cmd+o", 180 173 }, 181 174 { 175 + "command": "-workbench.action.showAllSymbols", 182 176 "key": "cmd+t", 183 - "command": "-workbench.action.showAllSymbols" 184 177 }, 185 178 { 179 + "command": "workbench.action.quickOpenNavigateNextInFilePicker", 186 180 "key": "cmd+p", 187 - "command": "workbench.action.quickOpenNavigateNextInFilePicker", 188 181 "when": "inFilesPicker && inQuickOpen" 189 182 }, 190 183 { 191 - "key": "cmd+p", 192 184 "command": "-workbench.action.quickOpenNavigateNextInFilePicker", 185 + "key": "cmd+p", 193 186 "when": "inFilesPicker && inQuickOpen" 194 187 }, 195 188 { 189 + "command": "workbench.action.quickOpen", 196 190 "key": "cmd+t", 197 - "command": "workbench.action.quickOpen" 198 191 }, 199 192 { 193 + "command": "-workbench.action.quickOpen", 200 194 "key": "cmd+p", 201 - "command": "-workbench.action.quickOpen" 202 - }, 203 - { 204 - "key": "escape", 205 - "command": "workbench.action.closeMessages", 206 - "when": "globalMessageVisible" 207 - }, 208 - // ========================================================================= 209 - // Bindings for vscode-neovim 210 - // ========================================================================= 211 - { 212 - "key": "escape", 213 - "command": "closeFindWidget", 214 - "when": "neovim.mode != 'insert' && editorFocus && findWidgetVisible" 215 195 }, 216 196 { 217 - "key": "escape", 218 - "command": "workbench.action.closePanel", 219 - "when": "neovim.mode != 'insert' && !(editorTextFocus && !inDebugRepl) && !terminalFocus && activePanel" 220 - }, 221 - { 222 - "key": "cmd+/", 223 - "command": "vscode-neovim.send", 224 - "when": "editorTextFocus && neovim.init", 225 - "args": "<C-/>" 226 - }, 227 - { 228 - "key": "cmd+c", 229 - "command": "vscode-neovim.send", 230 - "when": "editorTextFocus && neovim.init", 231 - "args": "\"+ygv" 232 - }, 233 - // ========================================================================= 234 - // End bindings for vscode-neovim 235 - // ========================================================================= 236 - { 237 197 "command": "editor.action.startFindReplaceAction", 238 198 "key": "cmd+r" 239 199 }, 240 200 { 201 + "command": "workbench.action.tasks.restartTask", 241 202 "key": "alt+cmd+b", 242 - "command": "workbench.action.tasks.restartTask" 243 203 }, 244 204 { 205 + "command": "workbench.action.editor.changeLanguageMode", 245 206 "key": "cmd+l", 246 - "command": "workbench.action.editor.changeLanguageMode" 247 207 }, 248 208 { 209 + "command": "-workbench.action.editor.changeLanguageMode", 249 210 "key": "cmd+k m", 250 - "command": "-workbench.action.editor.changeLanguageMode" 251 211 }, 252 212 { 213 + "command": "-python.execSelectionInTerminal", 253 214 "key": "shift+enter", 254 - "command": "-python.execSelectionInTerminal", 255 215 "when": "editorFocus && editorLangId == 'python'" 256 216 }, 257 217 { 258 - "key": "ctrl+alt+right", 259 218 "command": "-cursorWordPartRight", 219 + "key": "ctrl+alt+right", 260 220 "when": "textInputFocus" 261 221 }, 262 222 { 223 + "command": "-cursorWordPartRightSelect", 263 224 "key": "ctrl+shift+alt+right", 264 - "command": "-cursorWordPartRightSelect", 265 225 "when": "textInputFocus" 266 226 }, 267 227 { 268 - "key": "ctrl+alt+left", 269 228 "command": "-cursorWordPartStartLeft", 229 + "key": "ctrl+alt+left", 270 230 "when": "textInputFocus" 271 231 }, 272 232 { 273 - "key": "ctrl+shift+alt+left", 274 233 "command": "-cursorWordPartStartLeftSelect", 234 + "key": "ctrl+shift+alt+left", 275 235 "when": "textInputFocus" 276 236 }, 277 237 { 278 - "key": "ctrl+alt+backspace", 279 238 "command": "-deleteWordPartLeft", 239 + "key": "ctrl+alt+backspace", 280 240 "when": "textInputFocus && !editorReadonly" 281 241 }, 282 242 { 243 + "command": "-deleteWordPartRight", 283 244 "key": "ctrl+alt+delete", 284 - "command": "-deleteWordPartRight", 285 245 "when": "textInputFocus && !editorReadonly" 286 246 }, 287 247 { 248 + "command": "-workbench.action.toggleFullScreen", 288 249 "key": "ctrl+cmd+f", 289 - "command": "-workbench.action.toggleFullScreen" 290 250 }, 291 251 { 252 + "command": "-editor.action.startFindReplaceAction", 292 253 "key": "alt+cmd+f", 293 - "command": "-editor.action.startFindReplaceAction" 294 254 }, 295 255 { 256 + "command": "workbench.action.toggleFullScreen", 296 257 "key": "ctrl+cmd+f", 297 - "command": "workbench.action.toggleFullScreen" 258 + }, 259 + { 260 + "command": "-extension.downloadSettings", 261 + "key": "shift+alt+d", 262 + }, 263 + { 264 + "command": "-extension.updateSettings", 265 + "key": "shift+alt+u", 266 + }, 267 + { 268 + "command": "-python.execSelectionInTerminal", 269 + "key": "shift+enter", 270 + "when": "editorFocus && !findInputFocussed && !replaceInputFocussed && editorLangId == 'python'" 271 + }, 272 + { 273 + "command": "-python.datascience.runcurrentcelladvance", 274 + "key": "shift+enter", 275 + "when": "editorFocus && python.datascience.featureenabled && python.datascience.hascodecells" 276 + }, 277 + { 278 + "command": "-python.execSelectionInTerminal", 279 + "key": "shift+enter", 280 + "when": "editorFocus && !findInputFocussed && !python.datascience.hascodecells && !replaceInputFocussed && editorLangId == 'python'" 281 + }, 282 + { 283 + "key": "cmd+p", 284 + "command": "workbench.action.gotoSymbol" 285 + }, 286 + { 287 + "key": "shift+cmd+o", 288 + "command": "-workbench.action.gotoSymbol" 289 + }, 290 + { 291 + "key": "shift+cmd+enter", 292 + "command": "-editor.action.insertLineBefore", 293 + "when": "editorTextFocus && !editorReadonly" 294 + }, 295 + { 296 + "key": "shift+cmd+enter", 297 + "command": "workbench.action.maximizeEditor", 298 + "when": "editorFocus" 299 + }, 300 + { 301 + // note the additional `ctrl` here since we don't have a context to know if the editor is maximized 302 + "key": "ctrl+shift+cmd+enter", 303 + "command": "workbench.action.evenEditorWidths", 304 + "when": "editorFocus" 305 + }, 306 + { 307 + "key": "shift+cmd+enter", 308 + "command": "workbench.action.toggleMaximizedPanel", 309 + "when": "panelFocus" 310 + }, 311 + { 312 + "key": "cmd+k cmd+z", 313 + "command": "workbench.action.toggleZenMode", 314 + "when": "editorTextFocus" 315 + }, 316 + { 317 + "key": "shift+enter", 318 + "command": "-python.execSelectionInTerminal", 319 + "when": "editorFocus && !findInputFocussed && !python.datascience.ownsSelection && !replaceInputFocussed && editorLangId == 'python'" 320 + }, 321 + { 322 + "key": "shift+enter", 323 + "command": "-python.datascience.execSelectionInteractive", 324 + "when": "editorFocus && editorHasSelection && python.datascience.featureenabled && python.datascience.ownsSelection && !findInputFocussed && !replaceInputFocussed && editorLangId == 'python'" 325 + }, 326 + { 327 + "key": "shift+enter", 328 + "command": "-python.datascience.runcurrentcelladvance", 329 + "when": "editorFocus && python.datascience.featureenabled && python.datascience.hascodecells && !editorHasSelection" 330 + }, 331 + { 332 + "key": "shift+cmd+l", 333 + "command": "-editor.action.selectHighlights", 334 + "when": "editorFocus" 335 + }, 336 + { 337 + "key": "shift+cmd+l", 338 + "command": "editor.action.indentUsingSpaces" 298 339 }, 299 340 { 300 341 "key": "cmd+0", ··· 303 344 { 304 345 "key": "cmd+0", 305 346 "command": "workbench.action.zoomReset" 306 - }, 307 - { 308 - "key": "cmd+numpad0", 309 - "command": "-workbench.action.zoomReset" 310 347 }, 311 348 { 312 349 "key": "alt+cmd+right", ··· 317 354 "command": "-workbench.action.previousEditor" 318 355 }, 319 356 { 320 - "key": "shift+cmd+l", 321 - "command": "-editor.action.selectHighlights", 322 - "when": "editorFocus" 357 + "key": "shift+cmd+\\", 358 + "command": "workbench.action.splitEditorOrthogonal" 323 359 }, 324 360 { 325 - "key": "shift+cmd+l", 326 - "command": "editor.action.indentUsingSpaces" 361 + "key": "cmd+k cmd+\\", 362 + "command": "-workbench.action.splitEditorOrthogonal" 327 363 }, 328 364 { 329 - "key": "shift+enter", 330 - "command": "-python.datascience.execSelectionInteractive", 331 - "when": "editorTextFocus && python.datascience.featureenabled && python.datascience.ownsSelection && !findInputFocussed && !replaceInputFocussed && editorLangId == 'python'" 365 + "key": "shift+cmd+\\", 366 + "command": "-editor.action.jumpToBracket", 367 + "when": "editorTextFocus" 332 368 }, 333 369 { 334 - "key": "shift+enter", 335 - "command": "-python.execSelectionInTerminal", 336 - "when": "editorTextFocus && !findInputFocussed && !python.datascience.ownsSelection && !replaceInputFocussed && editorLangId == 'python'" 370 + "key": "alt+cmd+right", 371 + "command": "workbench.action.focusRightGroup", 372 + "when": "!terminalFocus" 337 373 }, 338 374 { 339 - "key": "cmd+\\", 340 - "command": "workbench.action.terminal.splitInActiveWorkspace", 341 - "when": "terminalFocus" 375 + "key": "cmd+k cmd+right", 376 + "command": "-workbench.action.focusRightGroup" 377 + }, 378 + { 379 + "key": "alt+cmd+left", 380 + "command": "workbench.action.focusLeftGroup", 381 + "when": "!terminalFocus" 342 382 }, 343 383 { 344 - "key": "cmd+\\", 345 - "command": "-workbench.action.terminal.split", 346 - "when": "terminalFocus" 384 + "key": "cmd+k cmd+left", 385 + "command": "-workbench.action.focusLeftGroup" 386 + }, 387 + { 388 + "key": "alt+cmd+up", 389 + "command": "workbench.action.focusAboveGroup" 390 + }, 391 + { 392 + "key": "cmd+k cmd+up", 393 + "command": "-workbench.action.focusAboveGroup" 394 + }, 395 + { 396 + "key": "alt+cmd+down", 397 + "command": "workbench.action.focusBelowGroup" 398 + }, 399 + { 400 + "key": "cmd+k cmd+down", 401 + "command": "-workbench.action.focusBelowGroup" 402 + }, 403 + { 404 + "key": "alt+cmd+up", 405 + "command": "-editor.action.insertCursorAbove", 406 + "when": "editorTextFocus" 407 + }, 408 + { 409 + "key": "alt+cmd+down", 410 + "command": "-editor.action.insertCursorBelow", 411 + "when": "editorTextFocus" 412 + }, 413 + { 414 + "key": "alt+cmd+r", 415 + "command": "-revealFileInOS", 416 + "when": "!editorFocus" 347 417 }, 348 418 { 349 - "key": "cmd+enter", 350 - "command": "-search.action.openInEditor", 351 - "when": "hasSearchResult && searchViewletFocus" 419 + "key": "cmd+k shift+cmd+s", 420 + "command": "workbench.files.action.showActiveFileInExplorer" 352 421 }, 353 422 { 354 - "key": "alt+left", 355 - "command": "cursorWordStartLeft", 356 - "when": "textInputFocus && editorLangId != 'org'" 423 + "key": "ctrl+enter", 424 + "command": "-python.datascience.runcurrentcell", 425 + "when": "editorTextFocus && python.datascience.featureenabled && python.datascience.hascodecells && !editorHasSelection" 357 426 }, 358 427 { 359 - "key": "alt+left", 360 - "command": "-cursorWordStartLeft", 361 - "when": "textInputFocus" 428 + "key": "shift+enter", 429 + "command": "-python.datascience.runcurrentcelladvance", 430 + "when": "editorTextFocus && python.datascience.featureenabled && python.datascience.hascodecells && !editorHasSelection" 362 431 }, 363 432 { 364 - "key": "alt+right", 365 - "command": "cursorWordEndRight", 366 - "when": "textInputFocus && editorLangId != 'org'" 433 + "key": "shift+enter", 434 + "command": "-python.datascience.execSelectionInteractive", 435 + "when": "editorTextFocus && python.datascience.featureenabled && python.datascience.ownsSelection && !findInputFocussed && !replaceInputFocussed && editorLangId == 'python'" 367 436 }, 368 437 { 369 - "key": "alt+right", 370 - "command": "-cursorWordEndRight", 371 - "when": "textInputFocus" 438 + "key": "shift+enter", 439 + "command": "-python.execSelectionInTerminal", 440 + "when": "editorTextFocus && !findInputFocussed && !python.datascience.ownsSelection && !replaceInputFocussed && editorLangId == 'python'" 372 441 }, 373 442 { 374 - "key": "cmd+k cmd+s", 375 - "command": "-workbench.action.openGlobalKeybindings" 443 + "key": "cmd+enter", 444 + "command": "-search.action.openInEditor", 445 + "when": "hasSearchResult && searchViewletFocus" 376 446 }, 377 447 { 378 - "key": "cmd+k cmd+s", 379 - "command": "workbench.action.openGlobalKeybindingsFile" 448 + "key": "cmd+enter", 449 + "command": "search.action.replaceAll", 450 + "when": "replaceActive && searchViewletFocus && !findWidgetVisible" 380 451 } 381 - ] 452 + ]

+301 -132

Library/Application Support/Code/User/settings.json

··· 1 1 { 2 - // Language-specific settings 3 - "[bazel]": { 4 - "editor.formatOnSave": true 5 - }, 6 2 "[cpp]": { 3 + "editor.detectIndentation": false, 7 4 "editor.formatOnSave": true 8 5 }, 9 6 "[json]": { 10 - "editor.formatOnSave": false 7 + "editor.formatOnSave": false, 8 + "editor.wordWrap": "on", 9 + "editor.tabSize": 2 10 + }, 11 + "[jsonc]": { 12 + "editor.formatOnSave": false, 13 + "editor.wordWrap": "on", 14 + "editor.tabSize": 2 15 + }, 16 + "[markdown]": { 17 + "editor.wordWrap": "on", 18 + "editor.quickSuggestions": false, 19 + "editor.tabSize": 2 11 20 }, 12 21 "[org]": { 13 - "editor.wordWrap": "on" 22 + "editor.autoIndent": "advanced", 23 + "editor.tabSize": 1 14 24 }, 15 25 "[python]": { 26 + "editor.codeActionsOnSave": { 27 + "source.organizeImports": true 28 + }, 16 29 "editor.formatOnSave": true, 17 - "editor.suggest.showSnippets": false 30 + "editor.parameterHints.enabled": false, 31 + "editor.snippetSuggestions": "none", 32 + "editor.defaultFormatter": "ms-python.python" 33 + }, 34 + "[dockerfile]": { 35 + "editor.quickSuggestions": { 36 + "strings": true 37 + }, 38 + // This seems to highlight EVERYTHING in italics which sucks... 39 + "editor.semanticHighlighting.enabled": false 18 40 }, 19 41 "[rust]": { 20 42 "editor.formatOnSave": true 21 43 }, 22 - 23 - 24 - // TODO: reorganize the remaining sections into extension-specific vs VSCode 25 - "arduino.defaultBaudRate": 9600, 26 - "arduino.logLevel": "info", 44 + "[starlark]": { 45 + "editor.formatOnSave": true 46 + }, 47 + "[typescript]": { 48 + "editor.formatOnSave": true, 49 + "editor.codeActionsOnSave": { 50 + "source.fixAll.tslint": true 51 + }, 52 + "editor.tabSize": 2 53 + }, 54 + "[javascript]": { 55 + "editor.formatOnSave": true, 56 + "editor.tabSize": 2 57 + }, 58 + "[graphql]": { 59 + "editor.tabSize": 2 60 + }, 61 + "bazel.buildifierExecutable": "/Users/ichamberlain/go/bin/buildifier", 62 + "bazel.buildifierFixOnFormat": false, 63 + "bazel.executable": "/usr/local/bin/bazelisk", 27 64 "breadcrumbs.enabled": true, 65 + "C_Cpp.clang_format_path": "${workspaceFolder}/tools/bin/mac/clang-format", 66 + "C_Cpp.workspaceParsingPriority": "low", 67 + "C_Cpp.workspaceSymbols": "Just My Code", 68 + "C_Cpp.loggingLevel": "Debug", 69 + "cmake.cmakePath": "/usr/local/bin/cmake", 70 + "cmake.configureOnOpen": false, 28 71 "debug.internalConsoleOptions": "openOnSessionStart", 29 72 "diffEditor.ignoreTrimWhitespace": false, 30 - "diffEditor.renderSideBySide": false, 73 + "diffEditor.renderSideBySide": true, 31 74 "editor.accessibilitySupport": "off", 32 - "editor.fontFamily": "Input Mono, Monaco, 'Courier New', monospace", 75 + "editor.fontFamily": "Input Mono", 33 76 "editor.fontSize": 11, 34 77 "editor.fontWeight": "100", 35 78 "editor.minimap.showSlider": "always", 36 79 "editor.renderControlCharacters": false, 37 - "editor.renderWhitespace": "none", 80 + "editor.renderWhitespace": "all", 38 81 "editor.rulers": [ 39 82 80 40 83 ], ··· 43 86 "editor.snippetSuggestions": "top", 44 87 "editor.wordSeparators": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-_", 45 88 "explorer.autoReveal": false, 89 + "explorer.confirmDelete": false, 90 + "extensions.autoUpdate": false, 46 91 "extensions.ignoreRecommendations": false, 92 + "rfLanguageServer.logLevel": "info", 93 + "shellcheck.run": "onSave", 94 + "shellcheck.enableQuickFix": true, 95 + "shellcheck.ignorePatterns": { 96 + "**/*.zsh": true, 97 + "**/*.fish": true, 98 + "**/BUILD": true, 99 + }, 47 100 "files.associations": { 101 + "**/.bazelignore": "gitignore", 102 + "*.bazel": "starlark", 103 + "*.bazelrc": "gitignore", 104 + "**/BUILD": "starlark", 105 + ".gitmodules": "properties", 106 + "*.aliases": "shellscript", 48 107 "*.h": "c", 49 108 "*.init": "json", 50 - "*.inputactions": "json", 51 - "Cargo.lock": "toml", 52 - "*.rs": "rust", 109 + "*.j2": "jinja", 110 + "*.lock": "toml", 111 + "yarn.lock": "yarnlock", 112 + "*.my": "mib", 113 + "*.repo": "ini", 53 114 "*.service": "ini", 54 - "*.unity": "yaml", 55 - "*Brewfile": "ruby", 56 - ".clang-format": "yaml", 57 - ".gitmodules": "properties", 115 + "*.sls": "sls", 116 + "bash_profile": "shellscript", 117 + "bashrc": "shellscript", 118 + "config": "toml", 119 + "vimrc": "viml", 120 + "build": "shellscript", 121 + ".coveragerc": "ini", 122 + "*.plist": "xml", 123 + "gdbinit": "shellscript", 124 + "minion": "log", 125 + "*dockerfile": "dockerfile", 126 + "**/.ssh/config": "ssh_config", 127 + "*.org": "org" 128 + }, 129 + "files.exclude": { 130 + "__pycache__": true, 131 + "**/.DS_Store": true, 132 + "**/.git": true, 133 + "**/.hg": true, 134 + "**/.svn": true, 135 + "**/bazel-*": true, 136 + "**/CVS": true 58 137 }, 59 138 "files.insertFinalNewline": true, 60 139 "files.trimTrailingWhitespace": true, 140 + "git.autoRepositoryDetection": "openEditors", 141 + "git.detectSubmodules": false, 61 142 "git.enableSmartCommit": true, 143 + "git.openDiffOnClick": false, 62 144 "gitlens.advanced.fileHistoryFollowsRenames": false, 145 + // GitLens settings 63 146 "gitlens.advanced.messages": { 64 147 "suppressCommitHasNoPreviousCommitWarning": false, 65 148 "suppressCommitNotFoundWarning": false, ··· 75 158 "gitlens.blame.avatars": false, 76 159 "gitlens.codeLens.enabled": false, 77 160 "gitlens.currentLine.enabled": false, 161 + "gitlens.hovers.currentLine.enabled": false, 162 + "gitlens.hovers.currentLine.over": "line", 78 163 "gitlens.keymap": "alternate", 164 + "gitlens.menus": { 165 + "editor": { 166 + "blame": true, 167 + "clipboard": true, 168 + "compare": true, 169 + "details": true, 170 + "history": true, 171 + "remote": true 172 + }, 173 + "editorGroup": { 174 + "blame": true, 175 + "compare": true 176 + }, 177 + "editorTab": { 178 + "clipboard": true, 179 + "compare": true, 180 + "history": true, 181 + "remote": true 182 + }, 183 + "explorer": { 184 + "clipboard": true, 185 + "compare": true, 186 + "history": true, 187 + "remote": true 188 + }, 189 + "scmGroup": { 190 + "compare": true, 191 + "openClose": true, 192 + "stash": true, 193 + "stashInline": true 194 + }, 195 + "scmItem": { 196 + "clipboard": true, 197 + "compare": true, 198 + "history": true, 199 + "remote": true, 200 + "stash": true 201 + } 202 + }, 203 + "gitlens.mode.statusBar.enabled": false, 79 204 "gitlens.views.compare.files.layout": "list", 80 205 "gitlens.views.fileHistory.enabled": true, 81 206 "gitlens.views.lineHistory.enabled": true, 82 207 "gitlens.views.repositories.autoRefresh": false, 83 208 "gitlens.views.repositories.enabled": false, 84 209 "gitlens.views.search.files.layout": "list", 85 - "org.todoKeywords": [ 86 - "TODO", 87 - "PROG", 88 - "DONE" 210 + "grunt.autoDetect": "off", 211 + "gulp.autoDetect": "off", 212 + "jake.autoDetect": "off", 213 + "python.venvPath": "/Users/ichamberlain/.pyenv", 214 + "python.terminal.activateEnvironment": false, 215 + "python.linting.lintOnSave": true, 216 + "remote.containers.defaultExtensions": [ 217 + "codezombiech.gitignore", 218 + "vscodevim.vim" 89 219 ], 90 - "python.formatting.provider": "black", 91 - "python.terminal.activateEnvironment": false, 92 - "python.venvPath": "~/.pyenv", 93 - "rust-analyzer.inlayHints.maxLength": 10, 94 - "rust-analyzer.inlayHints.typeHints": false, 220 + "rpmspec.lint": false, 221 + "rust-analyzer.checkOnSave.enable": true, 222 + "sync.autoDownload": false, 223 + "sync.autoUpload": false, 224 + "sync.forceDownload": false, 225 + "sync.gist": "f7654cb18c397fb8c4f4b433d6ecc48a", 226 + "sync.quietSync": false, 227 + "sync.removeExtensions": true, 228 + "sync.syncExtensions": true, 95 229 "telemetry.enableTelemetry": false, 96 - "terminal.integrated.confirmOnExit": true, 97 - "terminal.integrated.copyOnSelection": true, 98 230 "terminal.integrated.fontSize": 11, 99 - "terminal.integrated.rightClickBehavior": "default", 231 + "terminal.integrated.copyOnSelection": true, 100 232 "terminal.integrated.scrollback": 10000, 101 - "typescript.check.npmIsInstalled": false, 102 - "vscode-neovim.highlightGroups.highlights": { 103 - "Conceal": "vim", 104 - "Directory": "vim", 105 - "IncSearch": { 106 - "backgroundColor": "theme.editor.findMatchBackground", 107 - "borderColor": "theme.editor.findMatchBorder" 233 + "terminal.integrated.enableBell": true, 234 + "terminal.integrated.macOptionClickForcesSelection": true, 235 + "todohighlight.keywords": [ 236 + "TODO", 237 + "FIXME", 238 + "NOTE" 239 + ], 240 + // vim settings 241 + "vim.foldfix": true, 242 + "vim.hlsearch": true, 243 + "vim.iskeyword": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-_", 244 + "vim.normalModeKeyBindings": [ 245 + { 246 + "after": [ 247 + "<esc>" 248 + ], 249 + "before": [ 250 + "<esc>" 251 + ], 252 + "commands": [ 253 + { 254 + "command": ":nohl" 255 + }, 256 + { 257 + "command": "closeFindWidget", 258 + "key": "escape", 259 + "when": "findWidgetVisible" 260 + }, 261 + { 262 + "command": "workbench.action.closePanel", 263 + "key": "escape" 264 + }, 265 + { 266 + "command": "notifications.hideToasts", 267 + "when": "notificationToastsVisible" 268 + }, 269 + { 270 + "command": "notifications.hideList", 271 + "when": "notificationCenterVisible" 272 + } 273 + ] 108 274 }, 109 - "Search": { 110 - "backgroundColor": "theme.editor.findMatchHighlightBackground", 111 - "borderColor": "theme.editor.findMatchHighlightBorder" 275 + { 276 + "after": [], 277 + "before": [ 278 + "?" 279 + ], 280 + "commands": [ 281 + { 282 + "command": "actions.find", 283 + "when": "editorFocus" 284 + }, 285 + { 286 + "command": "editor.action.previousMatchFindAction", 287 + "when": "editorFocus" 288 + } 289 + ] 112 290 }, 113 - "Substitute": "vim", 114 - "Todo": { 115 - "backgroundColor": "#ffeb3b", 116 - "color": "#2196f3", 117 - "overviewRulerColor": "rgba(255,189,42,0.8)" 291 + { 292 + "after": [], 293 + "before": [ 294 + "/" 295 + ], 296 + "commands": [ 297 + { 298 + "command": "actions.find", 299 + "when": "editorFocus" 300 + }, 301 + { 302 + "command": "editor.action.nextMatchFindAction", 303 + "when": "editorFocus" 304 + } 305 + ] 118 306 }, 119 - "Visual": { 120 - "backgroundColor": "theme.editor.selectionBackground" 307 + { 308 + "after": [], 309 + "before": [ 310 + "n" 311 + ], 312 + "commands": [ 313 + { 314 + "command": "editor.action.nextMatchFindAction", 315 + "when": "editorFocus" 316 + } 317 + ] 318 + }, 319 + { 320 + "after": [], 321 + "before": [ 322 + "N" 323 + ], 324 + "commands": [ 325 + { 326 + "command": "editor.action.previousMatchFindAction", 327 + "when": "editorFocus" 328 + } 329 + ] 330 + }, 331 + { 332 + "after": [], 333 + "before": [ 334 + "u" 335 + ], 336 + "commands": [ 337 + { 338 + "args": [], 339 + "command": "undo" 340 + } 341 + ] 342 + }, 343 + { 344 + "after": [], 345 + "before": [ 346 + "<C-r>" 347 + ], 348 + "commands": [ 349 + { 350 + "args": [], 351 + "command": "redo" 352 + } 353 + ] 121 354 } 122 - }, 123 - "vscode-neovim.highlightGroups.ignoreHighlights": [ 124 - "SpecialKey", 125 - "EndOfBuffer", 126 - "TermCursor", 127 - "TermCursorNC", 128 - "NonText", 129 - "ErrorMsg", 130 - "MoreMsg", 131 - "ModeMsg", 132 - "LineNr", 133 - "CursorLineNr", 134 - "Question", 135 - "StatusLine", 136 - "StatusLineNC", 137 - "VertSplit", 138 - "Title", 139 - "VisualNC", 140 - "WarningMsg", 141 - "WildMenu", 142 - "^Diff", 143 - "Sign", 144 - "SignColumn", 145 - "^Spell", 146 - "^Pmenu", 147 - "^Tab", 148 - "^Cursor", 149 - "ColorColumn", 150 - "QuickFixLine", 151 - "Whitespace", 152 - "NormalNC", 153 - "Normal", 154 - "NormalFloat", 155 - "MsgSeparator", 156 - "MsgArea", 157 - "^RedrawDebug", 158 - "Cursor", 159 - "lCursor", 160 - "MatchParen", 161 - "^Nvim", 162 - "Operator", 163 - "Delimiter", 164 - "Identifier", 165 - "SpecialChar", 166 - "Number", 167 - "Type", 168 - "String", 169 - "Error", 170 - "Comment", 171 - "Constant", 172 - "Special", 173 - "Statement", 174 - "PreProc", 175 - "Underlined", 176 - "Ignore", 177 - "Character", 178 - "Boolean", 179 - "Float", 180 - "Function", 181 - "Conditional", 182 - "Repeat", 183 - "Label", 184 - "Keyword", 185 - "Exception", 186 - "Include", 187 - "Define", 188 - "Macro", 189 - "PreCondit", 190 - "StorageClass", 191 - "Structure", 192 - "Typedef", 193 - "Tag", 194 - "SpecialComment", 195 - "Debug", 196 - "Folded", 197 - "FoldColumn" 198 355 ], 199 - "vscode-neovim.neovimExecutablePaths.darwin": "/usr/local/bin/nvim", 200 - "vscode-neovim.neovimInitPath": "~/.vimrc", 201 - "vscode-neovim.neovimPath": "/usr/local/bin/nvim", 356 + "vim.searchHighlightColor": "rgba(157, 85, 15, 1.0)", 357 + "vim.useSystemClipboard": false, 358 + "vim.visualstar": true, 202 359 "window.restoreWindows": "folders", 203 360 "window.title": "${folderName}${separator}${activeEditorMedium} ${dirty}", 204 361 "window.zoomLevel": 0, 362 + "workbench.editor.untitled.labelFormat": "name", 205 363 "workbench.colorCustomizations": { 206 364 "editor.selectionBackground": "#9d550f", 207 365 "editorCursor.foreground": "#9d550f" 208 366 }, 209 367 "workbench.colorTheme": "Monokai", 210 368 "workbench.editor.enablePreview": false, 211 - "workbench.editor.untitled.labelFormat": "name", 212 - "workbench.settings.editor": "json" 369 + "workbench.fontAliasing": "auto", 370 + "workbench.settings.editor": "json", 371 + "workbench.startupEditor": "newUntitledFile", 372 + "editor.multiCursorModifier": "alt", 373 + "go.formatTool": "goimports", 374 + "[xml]": { 375 + "editor.defaultFormatter": "redhat.vscode-xml" 376 + }, 377 + "yaml.schemas": { 378 + "file:///Users/ichamberlain/.vscode/extensions/atlassian.atlascode-1.2.2/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml" 379 + }, 380 + "remote.SSH.configFile": "~/.ssh/vscode_config", 381 + "editor.minimap.enabled": false 213 382 }

+31 -5

Library/Application Support/Code/User/snippets/cpp.json

··· 15 15 } 16 16 */ 17 17 "class declaration": { 18 + "description": "Generates Rule of 5 for a class", 18 19 "prefix": "class", 19 20 "body": [ 20 21 "class ${1}", 21 22 "{", 22 23 " public:", 23 24 " ${1}() = default;", 25 + " ~${1}() = default;", 24 26 "", 25 27 " ${1}(const ${1}&) = default;", 26 28 " ${1}(${1}&&) = default;", 27 29 " ${1}& operator=(const ${1}&) = default;", 28 30 " ${1}& operator=(${1}&&) = default;", 29 - " ~${1}() = default;", 30 31 "", 31 32 " private:", 32 33 "};" 33 34 ], 34 - "description": "Generates Rule of 5 for a class" 35 35 }, 36 36 "struct declaration": { 37 + "description": "Generates Rule of 5 for a struct", 37 38 "prefix": "struct", 38 39 "body": [ 39 40 "struct ${1}", 40 41 "{", 41 42 " ${1}() = default;", 43 + " ~${1}() = default;", 42 44 "", 43 45 " ${1}(const ${1}&) = default;", 44 46 " ${1}(${1}&&) = default;", 45 47 " ${1}& operator=(const ${1}&) = default;", 46 48 " ${1}& operator=(${1}&&) = default;", 47 - " ~${1}() = default;", 48 49 "};" 49 50 ], 50 - "description": "Generates Rule of 5 for a struct" 51 + }, 52 + "ignore diagnostic": { 53 + "description": "Compiler directive to skip a warning", 54 + "prefix": [ 55 + "#diag" 56 + ], 57 + "body": [ 58 + "#pragma GCC diagnostic push", 59 + "#pragma GCC diagnostic ignored \"-W${1:deprecated-declarations}\"", 60 + "${LINE_COMMENT:reason} ${2}", 61 + "${TM_SELECTED_TEXT}${0}", 62 + "", 63 + "#pragma GCC diagnostic pop", 64 + ] 65 + }, 66 + "disable clang-format": { 67 + "description": "Comments to disable clang-format", 68 + "prefix": [ 69 + "clang", 70 + "cf" 71 + ], 72 + "body": [ 73 + "${LINE_COMMENT} clang-format off", 74 + "${TM_SELECTED_TEXT}${0}", 75 + "${LINE_COMMENT} clang-format on", 76 + ] 51 77 } 52 - } 78 + }

+2 -16

Library/Application Support/Code/User/snippets/rust.json

··· 1 1 { 2 - // Place your snippets for rust here. Each snippet is defined under a snippet name and has a prefix, body and 2 + // Place your snippets for rust here. Each snippet is defined under a snippet name and has a prefix, body and 3 3 // description. The prefix is what is used to trigger the snippet and the body will be expanded and inserted. Possible variables are: 4 - // $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. Placeholders with the 4 + // $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. Placeholders with the 5 5 // same ids are connected. 6 6 // Example: 7 7 // "Print to console": { ··· 12 12 // ], 13 13 // "description": "Log output to console" 14 14 // } 15 - "dbg!": { 16 - "prefix": "dbg", 17 - "body": [ 18 - "dbg!($1)", 19 - ], 20 - "description": "Fix typo of dgb -> dbg!" 21 - }, 22 - "dbg! typo": { 23 - "prefix": "dgb", 24 - "body": [ 25 - "dbg!($1)", 26 - ], 27 - "description": "Fix typo of dgb -> dbg!" 28 - } 29 15 }

Configure Feed

Configure Feed