ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-13 03:28:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ads-master-vscode-2020-04-08T06-33-35'

Browse Source
This commit is contained in:
Anthony Dresser
2020-04-08 13:34:54 -07:00
parent 21964e15b0 c428a3aebf
commit ffdde0209b
339 changed files with 3796 additions and 3147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
extensions/git/package.json
View File

@@ -1001,6 +1001,31 @@
"command": "git.ignore",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "1_modification@3"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "1_modification"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
},
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "1_modification"
},
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
},
{
"command": "git.ignore",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "1_modification@3"
}
],
"scm/resourceState/context": [
@@ -1237,17 +1262,17 @@
"timeline/item/context": [
{
"command": "git.timeline.openDiff",
"group": "1_timeline",
"group": "1_actions",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file\\b/"
},
{
"command": "git.timeline.copyCommitId",
"group": "2_timeline@1",
"group": "5_copy@1",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/"
},
{
"command": "git.timeline.copyCommitMessage",
"group": "2_timeline@2",
"group": "5_copy@2",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/"
}
]

2
extensions/git/src/timelineProvider.ts
View File

@@ -227,6 +227,6 @@ export class GitTimelineProvider implements TimelineProvider {
@debounce(500)
private fireChanged() {
this._onDidChange.fire({ reset: true });
this._onDidChange.fire(undefined);
}
}

4
extensions/merge-conflict/package.nls.json
View File

@@ -14,10 +14,10 @@
"command.compare": "Compare Current Conflict",
"config.title": "Merge Conflict",
"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
"config.codeLensEnabled": "Create a CodeLens for merge conflict blocks within editor.",
"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",
"config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts.",
"config.diffViewPosition.current": "Open the diff view in the current editor group.",
"config.diffViewPosition.beside": "Open the diff view next to the current editor group.",
"config.diffViewPosition.below": "Open the diff view below the current editor group."
}
}

2
extensions/python/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "MagicStack/MagicPython",
"repositoryUrl": "https://github.com/MagicStack/MagicPython",
"commitHash": "c9b3409deb69acec31bbf7913830e93a046b30cc"
"commitHash": "0b09c1fca238d22e15ac5712d03f9bf6da626f9c"
}
},
"license": "MIT",

2
extensions/python/syntaxes/MagicPython.tmLanguage.json
View File

@@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/MagicStack/MagicPython/commit/c9b3409deb69acec31bbf7913830e93a046b30cc",
"version": "https://github.com/MagicStack/MagicPython/commit/0b09c1fca238d22e15ac5712d03f9bf6da626f9c",
"name": "MagicPython",
"scopeName": "source.python",
"patterns": [

4
extensions/sql/cgmanifest.json
View File

@@ -6,11 +6,11 @@
"git": {
"name": "Microsoft/vscode-mssql",
"repositoryUrl": "https://github.com/Microsoft/vscode-mssql",
"commitHash": "a79741f76fd33bd137a8c28172c9750b978309b6"
"commitHash": "a542fe96780e6b274adb281810d419a512fb5bb4"
}
},
"license": "MIT",
"version": "1.6.0"
"version": "1.9.0"
}
],
"version": 1

8
extensions/sql/syntaxes/sql.tmLanguage.json
View File

@@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/Microsoft/vscode-mssql/commit/a79741f76fd33bd137a8c28172c9750b978309b6",
"version": "https://github.com/Microsoft/vscode-mssql/commit/a542fe96780e6b274adb281810d419a512fb5bb4",
"name": "SQL",
"scopeName": "source.sql",
"patterns": [
@@ -404,7 +404,7 @@
}
},
"comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
"match": "(N)?(')[^']*(')",
"match": "(N)?(')(?:[^'\\\\]|\\\\.)*(')",
"name": "string.quoted.single.sql"
},
{
@@ -437,7 +437,7 @@
}
},
"comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
"match": "(`)[^`\\\\]*(`)",
"match": "(`)(?:[^`\\\\]|\\\\.)*(`)",
"name": "string.quoted.other.backtick.sql"
},
{
@@ -470,7 +470,7 @@
}
},
"comment": "this is faster than the next begin/end rule since sub-pattern will match till end-of-line and SQL files tend to have very long lines.",
"match": "(\")[^\"#]*(\")",
"match": "(\")(?:[^\"#\\\\]|\\\\.)*(\")",
"name": "string.quoted.double.sql"
},
{