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 7eaf220cafb9d9e901370ffce02229171cbf3ea6

Browse Source
This commit is contained in:
ADS Merger
2020-09-03 02:34:56 +00:00
committed by Anthony Dresser
parent 39d9eed585
commit a63578e6f7
519 changed files with 14338 additions and 6670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
extensions/docker/package.json
View File

@@ -15,7 +15,7 @@
"extensions": [ ".dockerfile", ".containerfile" ],
"filenames": [ "Dockerfile", "Containerfile" ],
"filenamePatterns": [ "Dockerfile.*", "Containerfile.*" ],
"aliases": [ "Dockerfile", "Containerfile" ],
"aliases": [ "Docker", "Dockerfile", "Containerfile" ],
"configuration": "./language-configuration.json"
}],
"grammars": [{

22
extensions/git/package.json
View File

@@ -754,13 +754,23 @@
"when": "scmProvider == git"
},
{
"command": "git.checkout",
"group": "1_header",
"command": "git.pull",
"group": "1_header@1",
"when": "scmProvider == git"
},
{
"command": "git.push",
"group": "1_header@2",
"when": "scmProvider == git"
},
{
"command": "git.clone",
"group": "1_header",
"group": "1_header@3",
"when": "scmProvider == git"
},
{
"command": "git.checkout",
"group": "1_header@4",
"when": "scmProvider == git"
},
{
@@ -1915,7 +1925,11 @@
"[git-commit]": {
"editor.rulers": [
72
]
],
"workbench.editor.restoreViewState": false
},
"[git-rebase]": {
"workbench.editor.restoreViewState": false
}
},
"viewsWelcome": [

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

@@ -107,7 +107,7 @@
"config.smartCommitChanges.all": "Automatically stage all changes.",
"config.smartCommitChanges.tracked": "Automatically stage tracked changes only.",
"config.suggestSmartCommit": "Suggests to enable smart commit (commit all changes when there are no staged changes).",
"config.enableCommitSigning": "Enables commit signing with GPG.",
"config.enableCommitSigning": "Enables commit signing with GPG or X.509.",
"config.discardAllScope": "Controls what changes are discarded by the `Discard all changes` command. `all` discards all changes. `tracked` discards only tracked files. `prompt` shows a prompt dialog every time the action is run.",
"config.decorations.enabled": "Controls whether Git contributes colors and badges to the explorer and the open editors view.",
"config.enableStatusBarSync": "Controls whether the Git Sync command appears in the status bar.",

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

@@ -460,7 +460,7 @@ export class CommandCenter {
@command('git.clone')
async clone(url?: string, parentPath?: string): Promise<void> {
if (!url) {
if (!url || typeof url !== 'string') {
url = await pickRemoteSource(this.model, {
providerLabel: provider => localize('clonefrom', "Clone from {0}", provider.name),
urlLabel: localize('repourl', "Clone from URL")

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

@@ -232,7 +232,7 @@ export class GitTimelineProvider implements TimelineProvider {
private onRepositoryStatusChanged(_repo: Repository) {
// console.log(`GitTimelineProvider.onRepositoryStatusChanged`);
// This is crappy, but for now just save the last time a status was run and use that as the timestamp for staged items
// This is less than ideal, but for now just save the last time a status was run and use that as the timestamp for staged items
this.repoStatusDate = new Date();
this.fireChanged();

15
extensions/github-authentication/package.json
View File

@@ -11,15 +11,14 @@
"categories": [
"Other"
],
"activationEvents": [
"*",
"onAuthenticationRequest:github"
],
"extensionKind": [
"ui",
"workspace",
"web"
],
"activationEvents": [
"onAuthenticationRequest:github"
],
"contributes": {
"commands": [
{
@@ -34,7 +33,13 @@
"when": "false"
}
]
}
},
"authentication": [
{
"label": "GitHub",
"id": "github"
}
]
},
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
"main": "./out/extension.js",

4
extensions/github-authentication/src/extension.ts
View File

@@ -22,7 +22,7 @@ export async function activate(context: vscode.ExtensionContext) {
return loginService.manuallyProvideToken();
}));
vscode.authentication.registerAuthenticationProvider({
context.subscriptions.push(vscode.authentication.registerAuthenticationProvider({
id: 'github',
label: 'GitHub',
supportsMultipleAccounts: false,
@@ -70,7 +70,7 @@ export async function activate(context: vscode.ExtensionContext) {
throw e;
}
}
});
}));
return;
}

6
extensions/json-language-features/client/src/browser/jsonClientMain.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { ExtensionContext } from 'vscode';
import { ExtensionContext, Uri } from 'vscode';
import { LanguageClientOptions } from 'vscode-languageclient';
import { startClient, LanguageClientConstructor } from '../jsonClient';
import { LanguageClient } from 'vscode-languageclient/browser';
@@ -17,9 +17,9 @@ declare function fetch(uri: string, options: any): any;
// this method is called when vs code is activated
export function activate(context: ExtensionContext) {
const serverMain = context.asAbsolutePath('server/dist/browser/jsonServerMain.js');
const serverMain = Uri.joinPath(context.extensionUri, 'server/dist/browser/jsonServerMain.js');
try {
const worker = new Worker(serverMain);
const worker = new Worker(serverMain.toString());
const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
return new LanguageClient(id, name, clientOptions, worker);
};

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

@@ -14,7 +14,7 @@
"dependencies": {
"jsonc-parser": "^2.2.1",
"request-light": "^0.3.0",
"vscode-json-languageservice": "^3.8.0",
"vscode-json-languageservice": "^3.8.3",
"vscode-languageserver": "7.0.0-next.3",
"vscode-uri": "^2.1.2"
},

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

@@ -80,10 +80,10 @@ request-light@^0.3.0:
https-proxy-agent "^2.2.4"
vscode-nls "^4.1.1"
vscode-json-languageservice@^3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.8.0.tgz#c7e7283f993e3db39fa5501407b023ada6fd3ae3"
integrity sha512-sYz5JElJMIlPoqhrRfG3VKnDjnPinLdblIiEVsJgTz1kj2hWD2q5BSbo+evH/5/jKDXDLfA8kb0lHC4vd5g5zg==
vscode-json-languageservice@^3.8.3:
version "3.8.3"
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.8.3.tgz#fae5e7bdda2b6ec4f64588c571df40b6bfcb09b5"
integrity sha512-8yPag/NQHCuTthahyaTtzK0DHT0FKM/xBU0mFBQ8nMo8C1i2P+FCyIVqICoNoHkRI2BTGlXKomPUpsqjSz0TnQ==
dependencies:
jsonc-parser "^2.2.1"
vscode-languageserver-textdocument "^1.0.1"

9
extensions/microsoft-authentication/package.json
View File

@@ -12,7 +12,6 @@
],
"enableProposedApi": true,
"activationEvents": [
"*",
"onAuthenticationRequest:microsoft"
],
"extensionKind": [
@@ -20,6 +19,14 @@
"workspace",
"web"
],
"contributes": {
"authentication": [
{
"label": "Microsoft",
"id": "microsoft"
}
]
},
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
"main": "./out/extension.js",
"browser": "./dist/browser/extension.js",

3
extensions/microsoft-authentication/src/AADHelper.ts
View File

@@ -5,6 +5,7 @@
import * as randomBytes from 'randombytes';
import * as querystring from 'querystring';
import { Buffer } from 'buffer';
import * as vscode from 'vscode';
import { createServer, startServer } from './authServer';
@@ -528,7 +529,7 @@ export class AzureActiveDirectoryService {
}
} catch (e) {
Logger.error('Refreshing token failed');
throw e;
throw new Error(REFRESH_NETWORK_FAILURE);
}
}

2
extensions/resource-deployment/src/services/resourceTypeService.ts
View File

@@ -42,7 +42,7 @@ export class ResourceTypeService implements IResourceTypeService {
vscode.extensions.all.forEach((extension) => {
const extensionResourceTypes = extension.packageJSON.contributes && extension.packageJSON.contributes.resourceDeploymentTypes as ResourceType[];
if (extensionResourceTypes) {
extensionResourceTypes.forEach((resourceType) => {
extensionResourceTypes.forEach((resourceType: ResourceType) => {
this.updatePathProperties(resourceType, extension.extensionPath);
resourceType.getProvider = (selectedOptions) => { return this.getProvider(resourceType, selectedOptions); };
this._resourceTypes.push(resourceType);

25
extensions/theme-abyss/themes/abyss-color-theme.json
View File

@@ -233,6 +233,20 @@
"foreground": "#22aa44"
}
},
{
"name": "Markup: Strong",
"scope": "markup.bold",
"settings": {
"fontStyle": "bold"
}
},
{
"name": "Markup: Emphasis",
"scope": "markup.italic",
"settings": {
"fontStyle": "italic"
}
},
{
"name": "Markup Inline",
"scope": "markup.inline.raw",
@@ -242,11 +256,14 @@
}
},
{
"name": "Markup Setext Header",
"scope": "markup.heading.setext",
"name": "Markup Headings",
"scope": [
"markup.heading",
"markup.heading.setext"
],
"settings": {
"fontStyle": "",
"foreground": "#ddbb88"
"fontStyle": "bold",
"foreground": "#6688cc"
}
}
],

1
extensions/theme-defaults/themes/hc_black_defaults.json
View File

@@ -136,6 +136,7 @@
{
"scope": "markup.heading",
"settings": {
"fontStyle": "bold",
"foreground": "#6796e6"
}
},

2
extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
View File

@@ -260,7 +260,7 @@
"entity.name.section"
],
"settings": {
"fontStyle": "",
"fontStyle": "bold",
"foreground": "#8ab1b0"
}
},

32
extensions/theme-red/themes/Red-color-theme.json
View File

@@ -350,6 +350,20 @@
"foreground": "#fb9a4bff"
}
},
{
"name": "Markup: Strong",
"scope": "markup.bold",
"settings": {
"fontStyle": "bold"
}
},
{
"name": "Markup: Emphasis",
"scope": "markup.italic",
"settings": {
"fontStyle": "italic"
}
},
{
"name": "Markup Inline",
"scope": "markup.inline.raw",
@@ -359,17 +373,15 @@
}
},
{
"name": "Markup Headings",
"scope": "markup.heading",
"name": "Headings",
"scope": [
"markup.heading",
"markup.heading.setext",
"punctuation.definition.heading",
"entity.name.section"
],
"settings": {
"foreground": "#fec758ff"
}
},
{
"name": "Markup Setext Header",
"scope": "markup.heading.setext",
"settings": {
"fontStyle": "",
"fontStyle": "bold",
"foreground": "#fec758ff"
}
},

2
extensions/theme-seti/build/update-icon-theme.js
View File

@@ -305,7 +305,7 @@ exports.update = function () {
}
return download(fileAssociationFile).then(function (content) {
let regex2 = /\.icon-(?:set|partial)\(['"]([\w-\.]+)['"],\s*['"]([\w-]+)['"],\s*(@[\w-]+)\)/g;
let regex2 = /\.icon-(?:set|partial)\(['"]([\w-\.+]+)['"],\s*['"]([\w-]+)['"],\s*(@[\w-]+)\)/g;
while ((match = regex2.exec(content)) !== null) {
let pattern = match[1];
let def = '_' + match[2];

2
extensions/theme-seti/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "seti-ui",
"repositoryUrl": "https://github.com/jesseweed/seti-ui",
"commitHash": "f3b2775662b0075aab56e5f0c03269f21f3f0f30"
"commitHash": "719e5d384e878b0e190abc80247a8726f083a393"
}
},
"version": "0.1.0"

BIN
extensions/theme-seti/icons/seti.woff
View File

Binary file not shown.

622
extensions/theme-seti/icons/vs-seti-icon-theme.json
View File

File diff suppressed because it is too large Load Diff

15
extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
View File

@@ -270,6 +270,20 @@
"foreground": "#D33682"
}
},
{
"name": "Markup: Strong",
"scope": "markup.bold",
"settings": {
"fontStyle": "bold"
}
},
{
"name": "Markup: Emphasis",
"scope": "markup.italic",
"settings": {
"fontStyle": "italic"
}
},
{
"name": "Markup Inline",
"scope": "markup.inline.raw",
@@ -282,6 +296,7 @@
"name": "Markup Headings",
"scope": "markup.heading",
"settings": {
"fontStyle": "bold",
"foreground": "#268BD2"
}
},

15
extensions/theme-solarized-light/themes/solarized-light-color-theme.json
View File

@@ -273,6 +273,20 @@
"foreground": "#D33682"
}
},
{
"name": "Markup: Strong",
"scope": "markup.bold",
"settings": {
"fontStyle": "bold"
}
},
{
"name": "Markup: Emphasis",
"scope": "markup.italic",
"settings": {
"fontStyle": "italic"
}
},
{
"name": "Markup Inline",
"scope": "markup.inline.raw",
@@ -285,6 +299,7 @@
"name": "Markup Headings",
"scope": "markup.heading",
"settings": {
"fontStyle": "bold",
"foreground": "#268BD2"
}
},

21
extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json
View File

@@ -223,6 +223,20 @@
"foreground": "#FFC58F"
}
},
{
"name": "Markup: Strong",
"scope": "markup.bold",
"settings": {
"fontStyle": "bold"
}
},
{
"name": "Markup: Emphasis",
"scope": "markup.italic",
"settings": {
"fontStyle": "italic"
}
},
{
"name": "Markup Inline",
"scope": "markup.inline.raw",
@@ -231,6 +245,13 @@
"foreground": "#FF9DA4"
}
},
{
"name": "Markup Headings",
"scope": "markup.heading",
"settings": {
"fontStyle": "bold"
}
},
{
"scope": "token.info-token",
"settings": {