ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

Browse Source
This commit is contained in:
Anthony Dresser
2019-09-24 21:36:17 -07:00
committed by GitHub
parent a29ae4d3b9
commit 6a6048d40f
541 changed files with 7045 additions and 7287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/configuration-editing/package.json
View File

@@ -51,7 +51,7 @@
"url": "vscode://schemas/keybindings"
},
{
"fileMatch": "vscode://defaultsettings/settings.json",
"fileMatch": "vscode://defaultsettings/*/*.json",
"url": "vscode://schemas/settings/default"
},
{

61
extensions/git/package.json
View File

@@ -469,11 +469,11 @@
},
{
"command": "git.clean",
"when": "config.git.enabled && gitOpenRepositoryCount != 0 && !gitFreshRepository"
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.cleanAll",
"when": "config.git.enabled && gitOpenRepositoryCount != 0 && !gitFreshRepository"
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.commit",
@@ -763,7 +763,7 @@
{
"command": "git.cleanAll",
"group": "5_stage",
"when": "scmProvider == git && !gitFreshRepository"
"when": "scmProvider == git"
},
{
"command": "git.stashIncludeUntracked",
@@ -831,7 +831,7 @@
},
{
"command": "git.cleanAll",
"when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "1_modification"
},
{
@@ -841,7 +841,7 @@
},
{
"command": "git.cleanAll",
"when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
},
{
@@ -850,6 +850,53 @@
"group": "inline"
}
],
"scm/resourceFolder/context": [
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "1_modification"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "inline"
},
{
"command": "git.unstage",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "1_modification"
},
{
"command": "git.unstage",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "inline"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "1_modification"
},
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "1_modification"
},
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
},
{
"command": "git.ignore",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "1_modification@3"
}
],
"scm/resourceState/context": [
{
"command": "git.stage",
@@ -933,12 +980,12 @@
},
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "1_modification"
},
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
},
{

2
extensions/git/package.nls.json
View File

@@ -55,7 +55,7 @@
"command.syncRebase": "Sync (Rebase)",
"command.publish": "Publish Branch",
"command.showOutput": "Show Git Output",
"command.ignore": "Add File to .gitignore",
"command.ignore": "Add to .gitignore",
"command.stashIncludeUntracked": "Stash (Include Untracked)",
"command.stash": "Stash",
"command.stashPop": "Pop Stash...",

12
extensions/git/src/repository.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { commands, Uri, Command, EventEmitter, Event, scm, SourceControl, SourceControlInputBox, SourceControlResourceGroup, SourceControlResourceState, SourceControlResourceDecorations, SourceControlInputBoxValidation, Disposable, ProgressLocation, window, workspace, WorkspaceEdit, ThemeColor, Decoration, Memento, SourceControlInputBoxValidationType, OutputChannel, LogLevel, env, ProgressOptions, CancellationToken } from 'vscode';
import { Uri, Command, EventEmitter, Event, scm, SourceControl, SourceControlInputBox, SourceControlResourceGroup, SourceControlResourceState, SourceControlResourceDecorations, SourceControlInputBoxValidation, Disposable, ProgressLocation, window, workspace, WorkspaceEdit, ThemeColor, Decoration, Memento, SourceControlInputBoxValidationType, OutputChannel, LogLevel, env, ProgressOptions, CancellationToken } from 'vscode';
import { Repository as BaseRepository, Commit, Stash, GitError, Submodule, CommitOptions, ForcePushMode } from './git';
import { anyEvent, filterEvent, eventToPromise, dispose, find, isDescendant, IDisposable, onceEvent, EmptyDisposable, debounceEvent, combinedDisposable } from './util';
import { memoize, throttle, debounce } from './decorators';
@@ -633,7 +633,6 @@ export class Repository implements Disposable {
private isRepositoryHuge = false;
private didWarnAboutLimit = false;
private isFreshRepository: boolean | undefined = undefined;
private disposables: Disposable[] = [];
@@ -1507,15 +1506,6 @@ export class Repository implements Disposable {
// set count badge
this.setCountBadge();
// Disable `Discard All Changes` for "fresh" repositories
// https://github.com/Microsoft/vscode/issues/43066
const isFreshRepository = !this._HEAD || !this._HEAD.commit;
if (this.isFreshRepository !== isFreshRepository) {
commands.executeCommand('setContext', 'gitFreshRepository', isFreshRepository);
this.isFreshRepository = isFreshRepository;
}
this._onDidChangeStatus.fire();
}

2
extensions/json-language-features/server/package.json
View File

@@ -14,7 +14,7 @@
"dependencies": {
"jsonc-parser": "^2.1.1",
"request-light": "^0.2.4",
"vscode-json-languageservice": "^3.3.3",
"vscode-json-languageservice": "^3.3.4",
"vscode-languageserver": "^5.3.0-next.8",
"vscode-nls": "^4.1.1",
"vscode-uri": "^2.0.3"

8
extensions/json-language-features/server/yarn.lock
View File

@@ -73,10 +73,10 @@ request-light@^0.2.4:
https-proxy-agent "^2.2.1"
vscode-nls "^4.0.0"
vscode-json-languageservice@^3.3.3:
version "3.3.3"
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.3.3.tgz#f7e512a2cd5e82fecbebf507d6fceaea47661297"
integrity sha512-5vL3OXTUuQpn6+tGd47dopio+7WwbtIZ07zfYMzAUX8eVWPZjfEsLeSWmQk5Xw+vwgu+j5zC4koz5UofLDGGRA==
vscode-json-languageservice@^3.3.4:
version "3.3.4"
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.3.4.tgz#4ff67580491d3a5dc469f4a78643f20adff0278d"
integrity sha512-/nuI4uDBfxyVyeGtBdYwP/tIaXYKOoymUOSozYKLzsmrDmu555gZpzc11LrARa96z92wSaa5hfjTtNMAoM2mxw==
dependencies:
jsonc-parser "^2.1.1"
vscode-languageserver-types "^3.15.0-next.2"

3
extensions/markdown-language-features/media/markdown.css
View File

@@ -182,13 +182,12 @@ pre.hljs code > div {
overflow: auto;
}
/** Theming */
pre code {
color: var(--vscode-editor-foreground);
tab-size: 4;
}
/** Theming */
.vscode-light pre {
background-color: rgba(220, 220, 220, 0.4);

1
extensions/merge-conflict/src/codelensProvider.ts
View File

@@ -100,6 +100,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
this.codeLensRegistrationHandle = vscode.languages.registerCodeLensProvider([
{ scheme: 'file' },
{ scheme: 'untitled' },
{ scheme: 'vscode-userdata' },
], this);
}
}

67
extensions/theme-defaults/themes/dark_plus.json
View File

@@ -23,6 +23,7 @@
"support.type",
"entity.name.type",
"entity.name.namespace",
"entity.other.attribute",
"entity.name.scope-resolution",
"entity.name.class",
"storage.type.numeric.go",
@@ -76,7 +77,8 @@
"source.cpp keyword.operator.new",
"keyword.operator.delete",
"keyword.other.using",
"keyword.other.operator"
"keyword.other.operator",
"entity.name.operator"
],
"settings": {
"foreground": "#C586C0"
@@ -171,72 +173,11 @@
"foreground": "#d7ba7d"
}
},
// Scopes that are potentially C++ only follow
{
"scope": "source.cpp entity.name",
"scope": "entity.name.label",
"settings": {
"foreground": "#C8C8C8"
}
},
{
"scope": "source.cpp keyword.control.directive",
"settings": {
"foreground": "#9B9B9B"
}
},
{
"scope": "source.cpp entity.name.function.operator",
"settings": {
"foreground": "#B4B4B4"
}
},
{
"scope": "source.cpp entity.name.function.preprocessor",
"settings": {
"foreground": "#C586C0"
}
},
{
"scope": "source.cpp entity.name.label",
"settings": {
"foreground": "#C8C8C8"
}
},
{
"scope": "source.cpp entity.name.operator.custom-literal",
"settings": {
"foreground": "#DADADA"
}
},
{
"scope": "source.cpp entity.name.operator.custom-literal.number",
"settings": {
"foreground": "#B5CEA8"
}
},
{
"scope": "source.cpp entity.name.operator.custom-literal.string",
"settings": {
"foreground": "#ce9178"
}
},
{
"scope": "source.cpp variable.other.enummember",
"settings": {
"foreground": "#B8D7A3"
}
},
{
"scope": "source.cpp variable.other.property",
"settings": {
"foreground": "#DADADA"
}
},
{
"scope": "source.cpp variable.parameter",
"settings": {
"foreground": "#7F7F7F"
}
}
]
}

28
extensions/theme-defaults/themes/dark_vs.json
View File

@@ -44,7 +44,11 @@
},
{
"scope": [
"constant.numeric"
"constant.numeric",
"entity.name.operator.custom-literal.number",
"variable.other.enummember",
"keyword.operator.plus.exponent",
"keyword.operator.minus.exponent"
],
"settings": {
"foreground": "#b5cea8"
@@ -166,7 +170,10 @@
}
},
{
"scope": "meta.preprocessor",
"scope": [
"meta.preprocessor",
"keyword.control.directive"
],
"settings": {
"foreground": "#569cd6"
}
@@ -208,13 +215,19 @@
}
},
{
"scope": "storage.modifier",
"scope": [
"storage.modifier",
"keyword.operator.noexcept"
],
"settings": {
"foreground": "#569cd6"
}
},
{
"scope": "string",
"scope": [
"string",
"entity.name.operator.custom-literal.string",
],
"settings": {
"foreground": "#ce9178"
}
@@ -294,8 +307,11 @@
"keyword.operator.expression",
"keyword.operator.cast",
"keyword.operator.sizeof",
"keyword.operator.typeid",
"keyword.operator.alignas",
"keyword.operator.instanceof",
"keyword.operator.logical.python"
"keyword.operator.logical.python",
"keyword.operator.wordlike"
],
"settings": {
"foreground": "#569cd6"
@@ -347,4 +363,4 @@
}
}
]
}
}

49
extensions/theme-defaults/themes/light_plus.json
View File

@@ -23,6 +23,7 @@
"support.type",
"entity.name.type",
"entity.name.namespace",
"entity.other.attribute",
"entity.name.scope-resolution",
"entity.name.class",
"storage.type.numeric.go",
@@ -76,7 +77,8 @@
"source.cpp keyword.operator.new",
"source.cpp keyword.operator.delete",
"keyword.other.using",
"keyword.other.operator"
"keyword.other.operator",
"entity.name.operator"
],
"settings": {
"foreground": "#AF00DB"
@@ -171,54 +173,11 @@
"foreground": "#ff0000"
}
},
// Scopes that are potentially C++ only follow
{
"scope": "source.cpp entity.name",
"scope": "entity.name.label",
"settings": {
"foreground": "#000000"
}
},
{
"scope": "source.cpp keyword.control.directive",
"settings": {
"foreground": "#808080"
}
},
{
"scope": "source.cpp entity.name.function.operator",
"settings": {
"foreground": "#008080"
}
},
{
"scope": "source.cpp entity.name.function.preprocessor",
"settings": {
"foreground": "#AF00DB"
}
},
{
"scope": "source.cpp entity.name.label",
"settings": {
"foreground": "#000000"
}
},
{
"scope": "source.cpp entity.name.operator.custom-literal.string",
"settings": {
"foreground": "#0451a5"
}
},
{
"scope": "source.cpp variable.other.enummember",
"settings": {
"foreground": "#2F4F4F"
}
},
{
"scope": "source.cpp variable.parameter",
"settings": {
"foreground": "#808080"
}
}
]
}

33
extensions/theme-defaults/themes/light_vs.json
View File

@@ -4,7 +4,10 @@
"include": "./light_defaults.json",
"tokenColors": [
{
"scope": ["meta.embedded", "source.groovy.embedded"],
"scope": [
"meta.embedded",
"source.groovy.embedded"
],
"settings": {
"foreground": "#000000ff"
}
@@ -41,7 +44,11 @@
},
{
"scope": [
"constant.numeric"
"constant.numeric",
"entity.name.operator.custom-literal.number",
"variable.other.enummember",
"keyword.operator.plus.exponent",
"keyword.operator.minus.exponent"
],
"settings": {
"foreground": "#09885a"
@@ -161,7 +168,10 @@
}
},
{
"scope": "meta.preprocessor",
"scope": [
"meta.preprocessor",
"keyword.control.directive"
],
"settings": {
"foreground": "#0000ff"
}
@@ -197,13 +207,19 @@
}
},
{
"scope": "storage.modifier",
"scope": [
"storage.modifier",
"keyword.operator.noexcept"
],
"settings": {
"foreground": "#0000ff"
}
},
{
"scope": "string",
"scope": [
"string",
"entity.name.operator.custom-literal.string",
],
"settings": {
"foreground": "#a31515"
}
@@ -315,8 +331,11 @@
"keyword.operator.expression",
"keyword.operator.cast",
"keyword.operator.sizeof",
"keyword.operator.typeid",
"keyword.operator.alignas",
"keyword.operator.instanceof",
"keyword.operator.logical.python"
"keyword.operator.logical.python",
"keyword.operator.wordlike"
],
"settings": {
"foreground": "#0000ff"
@@ -368,4 +387,4 @@
}
}
]
}
}