mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-06 01:25:38 -05:00
VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)
* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9 * delete unused folders * distro * Bump build node version * update chokidar * FIx hygiene errors * distro * Fix extension lint issues * Remove strict-vscode * Add copyright header exemptions * Bump vscode-extension-telemetry to fix webpacking issue with zone.js * distro * Fix failing tests (revert marked.js back to current one until we decide to update) * Skip searchmodel test * Fix mac build * temp debug script loading * Try disabling coverage * log error too * Revert "log error too" This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f. * Revert "temp debug script loading" This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c. * Add comments explaining coverage disabling * Fix ansi_up loading issue * Merge latest from ads * Use newer option * Fix compile * add debug logging warn * Always log stack * log more * undo debug * Update to use correct base path (+cleanup) * distro * fix compile errors * Remove strict-vscode * Fix sql editors not showing * Show db dropdown input & fix styling * Fix more info in gallery * Fix gallery asset requests * Delete unused workflow * Fix tapable resolutions for smoke test compile error * Fix smoke compile * Disable crash reporting * Disable interactive Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
@@ -577,7 +577,7 @@
|
||||
},
|
||||
{
|
||||
"command": "git.openChange",
|
||||
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
|
||||
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && resourcePath in git.changedResources"
|
||||
},
|
||||
{
|
||||
"command": "git.stage",
|
||||
@@ -1324,7 +1324,7 @@
|
||||
{
|
||||
"command": "git.openChange",
|
||||
"group": "navigation",
|
||||
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file"
|
||||
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file && resourcePath in git.changedResources"
|
||||
},
|
||||
{
|
||||
"command": "git.stageSelectedRanges",
|
||||
@@ -1553,10 +1553,10 @@
|
||||
"command": "git.branchFrom",
|
||||
"group": "branch@4"
|
||||
},
|
||||
{
|
||||
"command": "git.renameBranch",
|
||||
"group": "branch@5"
|
||||
},
|
||||
{
|
||||
"command": "git.renameBranch",
|
||||
"group": "branch@5"
|
||||
},
|
||||
{
|
||||
"command": "git.deleteBranch",
|
||||
"group": "branch@6"
|
||||
@@ -1692,8 +1692,15 @@
|
||||
"default": true
|
||||
},
|
||||
"git.autofetch": {
|
||||
"type": ["boolean", "string"],
|
||||
"enum": [true, false, "all"],
|
||||
"type": [
|
||||
"boolean",
|
||||
"string"
|
||||
],
|
||||
"enum": [
|
||||
true,
|
||||
false,
|
||||
"all"
|
||||
],
|
||||
"scope": "resource",
|
||||
"markdownDescription": "%config.autofetch%",
|
||||
"default": false,
|
||||
@@ -2376,7 +2383,7 @@
|
||||
"file-type": "^7.2.0",
|
||||
"iconv-lite-umd": "0.6.8",
|
||||
"jschardet": "2.3.0",
|
||||
"vscode-extension-telemetry": "0.1.7",
|
||||
"vscode-extension-telemetry": "0.2.8",
|
||||
"vscode-nls": "^4.0.0",
|
||||
"vscode-uri": "^2.0.0",
|
||||
"which": "^1.3.0"
|
||||
|
||||
Reference in New Issue
Block a user