ckaczor/azuredatastudio
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 7653d836944892f83ce9e1f95c1204bafa1aec31

Browse Source
This commit is contained in:
ADS Merger
2020-05-08 03:58:34 +00:00
parent dac1970c43
commit fa62ec1f34
209 changed files with 5131 additions and 2480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/git/package.json
+5
View File
@@ -409,6 +409,11 @@
"command": "git.timeline.copyCommitMessage",
"title": "%command.timelineCopyCommitMessage%",
"category": "Git"
},
{
"command": "git.rebaseAbort",
"title": "%command.rebaseAbort%",
"category": "Git"
}
],
"keybindings": [
extensions/git/package.nls.json
+1
View File
@@ -63,6 +63,7 @@
"command.showOutput": "Show Git Output",
"command.ignore": "Add to .gitignore",
"command.revealInExplorer": "Reveal in Side Bar",
"command.rebaseAbort": "Abort Rebase",
"command.stashIncludeUntracked": "Stash (Include Untracked)",
"command.stash": "Stash",
"command.stashPop": "Pop Stash...",
extensions/git/src/commands.ts
+4
View File
@@ -2494,6 +2494,10 @@ export class CommandCenter {
env.clipboard.writeText(item.message);
}
@command('git.rebaseAbort', { repository: true })
async rebaseAbort(repository: Repository): Promise<void> {
await repository.rebaseAbort();
}
private createCommand(id: string, key: string, method: Function, options: CommandOptions): (...args: any[]) => any {
const result = (...args: any[]) => {
extensions/git/src/git.ts
+4
View File
@@ -1333,6 +1333,10 @@ export class Repository {
}
}
async rebaseAbort(): Promise<void> {
await this.run(['rebase', '--abort']);
}
async rebaseContinue(): Promise<void> {
const args = ['rebase', '--continue'];
extensions/git/src/repository.ts
+5
View File
@@ -303,6 +303,7 @@ export const enum Operation {
CheckIgnore = 'CheckIgnore',
GetObjectDetails = 'GetObjectDetails',
SubmoduleUpdate = 'SubmoduleUpdate',
RebaseAbort = 'RebaseAbort',
RebaseContinue = 'RebaseContinue',
FindTrackingBranches = 'GetTracking',
Apply = 'Apply',
@@ -1331,6 +1332,10 @@ export class Repository implements Disposable {
});
}
async rebaseAbort(): Promise<void> {
await this.run(Operation.RebaseAbort, async () => await this.repository.rebaseAbort());
}
checkIgnore(filePaths: string[]): Promise<Set<string>> {
return this.run(Operation.CheckIgnore, () => {
return new Promise<Set<string>>((resolve, reject) => {
extensions/json-language-features/client/src/jsonMain.ts
+67 -37
View File
@@ -77,6 +77,12 @@ interface JSONSchemaSettings {
schema?: any;
}
namespace SettingIds {
export const enableFormatter = 'json.format.enable';
export const enableSchemaDownload = 'json.schemaDownload.enable';
export const maxItemsComputed = 'json.maxItemsComputed';
}
let telemetryReporter: TelemetryReporter | undefined;
export function activate(context: ExtensionContext) {
@@ -107,10 +113,8 @@ export function activate(context: ExtensionContext) {
id: 'status.json.resolveError',
name: localize('json.resolveError', "JSON: Schema Resolution Error"),
alignment: StatusBarAlignment.Right,
priority: 0
priority: 0,
});
schemaResolutionErrorStatusBarItem.command = '_json.retryResolveSchema';
schemaResolutionErrorStatusBarItem.tooltip = localize('json.schemaResolutionErrorMessage', 'Unable to resolve schema.') + ' ' + localize('json.clickToRetry', 'Click to retry.');
schemaResolutionErrorStatusBarItem.text = '$(alert)';
toDispose.push(schemaResolutionErrorStatusBarItem);
@@ -200,6 +204,7 @@ export function activate(context: ExtensionContext) {
toDispose.push(disposable);
client.onReady().then(() => {
const schemaDocuments: { [uri: string]: boolean } = {};
let schemaDownloadEnabled = true;
// handle content request
client.onRequest(VSCodeContentRequest.type, (uriPath: string) => {
@@ -208,12 +213,16 @@ export function activate(context: ExtensionContext) {
return Promise.reject(new Error(localize('untitled.schema', 'Unable to load {0}', uri.toString())));
}
if (uri.scheme !== 'http' && uri.scheme !== 'https') {
return workspace.openTextDocument(uri).then(doc => {
schemaDocuments[uri.toString()] = true;
return doc.getText();
}, error => {
return Promise.reject(error);
});
if (schemaDownloadEnabled) {
return workspace.openTextDocument(uri).then(doc => {
schemaDocuments[uri.toString()] = true;
return doc.getText();
}, error => {
return Promise.reject(error);
});
} else {
return Promise.reject(localize('schemaDownloadDisabled', 'Downloading schemas is disabled through setting \'{0}\'', SettingIds.enableSchemaDownload));
}
} else {
if (telemetryReporter && uri.authority === 'schema.management.azure.com') {
/* __GDPR__
@@ -294,16 +303,61 @@ export function activate(context: ExtensionContext) {
client.sendNotification(SchemaAssociationNotification.type, getSchemaAssociations(context));
});
// manually register / deregister format provider based on the `html.format.enable` setting avoiding issues with late registration. See #71652.
// manually register / deregister format provider based on the `json.format.enable` setting avoiding issues with late registration. See #71652.
updateFormatterRegistration();
toDispose.push({ dispose: () => rangeFormatting && rangeFormatting.dispose() });
toDispose.push(workspace.onDidChangeConfiguration(e => e.affectsConfiguration('html.format.enable') && updateFormatterRegistration()));
updateSchemaDownloadSetting();
toDispose.push(workspace.onDidChangeConfiguration(e => {
if (e.affectsConfiguration(SettingIds.enableFormatter)) {
updateFormatterRegistration();
} else if (e.affectsConfiguration(SettingIds.enableSchemaDownload)) {
updateSchemaDownloadSetting();
}
}));
client.onNotification(ResultLimitReachedNotification.type, message => {
window.showInformationMessage(`${message}\nUse setting 'json.maxItemsComputed' to configure the limit.`);
window.showInformationMessage(`${message}\n${localize('configureLimit', 'Use setting \'{0}\' to configure the limit.', SettingIds.maxItemsComputed)}`);
});
function updateFormatterRegistration() {
const formatEnabled = workspace.getConfiguration().get(SettingIds.enableFormatter);
if (!formatEnabled && rangeFormatting) {
rangeFormatting.dispose();
rangeFormatting = undefined;
} else if (formatEnabled && !rangeFormatting) {
rangeFormatting = languages.registerDocumentRangeFormattingEditProvider(documentSelector, {
provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]> {
const params: DocumentRangeFormattingParams = {
textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
range: client.code2ProtocolConverter.asRange(range),
options: client.code2ProtocolConverter.asFormattingOptions(options)
};
return client.sendRequest(DocumentRangeFormattingRequest.type, params, token).then(
client.protocol2CodeConverter.asTextEdits,
(error) => {
client.logFailedRequest(DocumentRangeFormattingRequest.type, error);
return Promise.resolve([]);
}
);
}
});
}
}
function updateSchemaDownloadSetting() {
schemaDownloadEnabled = workspace.getConfiguration().get(SettingIds.enableSchemaDownload) !== false;
if (schemaDownloadEnabled) {
schemaResolutionErrorStatusBarItem.tooltip = localize('json.schemaResolutionErrorMessage', 'Unable to resolve schema. Click to retry.');
schemaResolutionErrorStatusBarItem.command = '_json.retryResolveSchema';
handleRetryResolveSchemaCommand();
} else {
schemaResolutionErrorStatusBarItem.tooltip = localize('json.schemaResolutionDisabledMessage', 'Downloading schemas is disabled. Click to configure.');
schemaResolutionErrorStatusBarItem.command = { command: 'workbench.action.openSettings', arguments: [SettingIds.enableSchemaDownload], title: '' };
}
}
});
const languageConfiguration: LanguageConfiguration = {
@@ -316,30 +370,6 @@ export function activate(context: ExtensionContext) {
languages.setLanguageConfiguration('json', languageConfiguration);
languages.setLanguageConfiguration('jsonc', languageConfiguration);
function updateFormatterRegistration() {
const formatEnabled = workspace.getConfiguration().get('json.format.enable');
if (!formatEnabled && rangeFormatting) {
rangeFormatting.dispose();
rangeFormatting = undefined;
} else if (formatEnabled && !rangeFormatting) {
rangeFormatting = languages.registerDocumentRangeFormattingEditProvider(documentSelector, {
provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]> {
const params: DocumentRangeFormattingParams = {
textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
range: client.code2ProtocolConverter.asRange(range),
options: client.code2ProtocolConverter.asFormattingOptions(options)
};
return client.sendRequest(DocumentRangeFormattingRequest.type, params, token).then(
client.protocol2CodeConverter.asTextEdits,
(error) => {
client.logFailedRequest(DocumentRangeFormattingRequest.type, error);
return Promise.resolve([]);
}
);
}
});
}
}
}
@@ -386,7 +416,7 @@ function getSchemaAssociations(_context: ExtensionContext): ISchemaAssociation[]
function getSettings(): Settings {
const httpSettings = workspace.getConfiguration('http');
const resultLimit: number = Math.trunc(Math.max(0, Number(workspace.getConfiguration().get('json.maxItemsComputed')))) || 5000;
const resultLimit: number = Math.trunc(Math.max(0, Number(workspace.getConfiguration().get(SettingIds.maxItemsComputed)))) || 5000;
const settings: Settings = {
http: {
extensions/json-language-features/package.json
+7 -1
View File
@@ -95,7 +95,13 @@
"type": "number",
"default": 5000,
"description": "%json.maxItemsComputed.desc%"
}
},
"json.schemaDownload.enable": {
"type": "boolean",
"default": true,
"description": "%json.enableSchemaDownload.desc%",
"tags": ["usesOnlineServices"]
}
}
},
"configurationDefaults": {
extensions/json-language-features/package.nls.json
+2 -1
View File
@@ -12,5 +12,6 @@
"json.colorDecorators.enable.deprecationMessage": "The setting `json.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",
"json.schemaResolutionErrorMessage": "Unable to resolve schema.",
"json.clickToRetry": "Click to retry.",
"json.maxItemsComputed.desc": "The maximum number of outline symbols and folding regions computed (limited for performance reasons)."
"json.maxItemsComputed.desc": "The maximum number of outline symbols and folding regions computed (limited for performance reasons).",
"json.enableSchemaDownload.desc": "When enabled, JSON schemas can be fetched from http and https locations."
}
extensions/machine-learning/src/test/mainController.test.ts
+2 -1
View File
@@ -90,7 +90,8 @@ function createContext(): TestContext {
storagePath: '',
globalStoragePath: '',
logPath: '',
extensionUri: vscode.Uri.parse('')
extensionUri: vscode.Uri.parse(''),
environmentVariableCollection: { } as any
},
outputChannel: {
name: '',
extensions/notebook/src/test/common/stubs.ts
+1
View File
@@ -22,6 +22,7 @@ export class MockExtensionContext implements vscode.ExtensionContext {
constructor() {
this.subscriptions = [];
}
environmentVariableCollection: vscode.EnvironmentVariableCollection;
}
export class MockOutputChannel implements vscode.OutputChannel {
extensions/sql-database-projects/src/test/testContext.ts
+2 -1
View File
@@ -33,7 +33,8 @@ export function createContext(): TestContext {
storagePath: '',
globalStoragePath: '',
logPath: '',
extensionUri: vscode.Uri.parse('')
extensionUri: vscode.Uri.parse(''),
environmentVariableCollection: undefined as any
},
};
}
extensions/theme-seti/build/update-icon-theme.js
+20 -4
View File
@@ -10,8 +10,8 @@ let fs = require('fs');
let https = require('https');
let url = require('url');
// list of languagesIs not shipped with VSCode. The information is used to associate an icon with a language association
let nonBuiltInLanguages = { // { fileNames, extensions }
// list of languagesId not shipped with VSCode. The information is used to associate an icon with a language association
let nonBuiltInLanguages = { // { fileNames, extensions }
"r": { extensions: ['r', 'rhistory', 'rprofile', 'rt'] },
"argdown": { extensions: ['ad', 'adown', 'argdown', 'argdn'] },
"elm": { extensions: ['elm'] },
@@ -32,10 +32,16 @@ let nonBuiltInLanguages = { // { fileNames, extensions }
"haml": { extensions: ['haml'] },
"stylus": { extensions: ['styl'] },
"vala": { extensions: ['vala'] },
"todo": { fileNames: ['todo'] },
"jsonc": { extensions: ['json'] }
"todo": { fileNames: ['todo'] }
};
// list of languagesId that inherit the icon from another language
let inheritIconFromLanguage = {
"jsonc": 'json',
"postcss": 'css',
"django-html": 'html'
}
let FROM_DISK = true; // set to true to take content from a repo checked out next to the vscode repo
let font, fontMappingsFile, fileAssociationFile, colorsFile;
@@ -358,6 +364,16 @@ exports.update = function () {
}
}
}
for (let lang in inheritIconFromLanguage) {
let superLang = inheritIconFromLanguage[lang];
let def = lang2Def[superLang];
if (def) {
lang2Def[lang] = def;
} else {
console.log('skipping icon def for ' + lang + ': no icon for ' + superLang + ' defined');
}
}
return download(colorsFile).then(function (content) {
extensions/theme-seti/cgmanifest.json
+1 -1
View File
@@ -6,7 +6,7 @@
"git": {
"name": "seti-ui",
"repositoryUrl": "https://github.com/jesseweed/seti-ui",
"commitHash": "4b3e0a3d0ca8999430bc3aa9f2c8324e6922b3de"
"commitHash": "8f22764c37feb7f706465f5186132111a2401b6b"
}
},
"version": "0.1.0"
extensions/theme-seti/icons/seti.woff
BIN
View File
Binary file not shown.
extensions/theme-seti/icons/vs-seti-icon-theme.json
+141 -107
View File
@@ -966,399 +966,413 @@
"fontCharacter": "\\E06C",
"fontColor": "#519aba"
},
"_pug_light": {
"_prolog_light": {
"fontCharacter": "\\E06E",
"fontColor": "#cc6d2e"
},
"_prolog": {
"fontCharacter": "\\E06E",
"fontColor": "#e37933"
},
"_pug_light": {
"fontCharacter": "\\E06F",
"fontColor": "#b8383d"
},
"_pug": {
"fontCharacter": "\\E06E",
"fontCharacter": "\\E06F",
"fontColor": "#cc3e44"
},
"_puppet_light": {
"fontCharacter": "\\E06F",
"fontCharacter": "\\E070",
"fontColor": "#b7b73b"
},
"_puppet": {
"fontCharacter": "\\E06F",
"fontCharacter": "\\E070",
"fontColor": "#cbcb41"
},
"_python_light": {
"fontCharacter": "\\E070",
"fontCharacter": "\\E071",
"fontColor": "#498ba7"
},
"_python": {
"fontCharacter": "\\E070",
"fontCharacter": "\\E071",
"fontColor": "#519aba"
},
"_react_light": {
"fontCharacter": "\\E072",
"fontCharacter": "\\E073",
"fontColor": "#498ba7"
},
"_react": {
"fontCharacter": "\\E072",
"fontCharacter": "\\E073",
"fontColor": "#519aba"
},
"_react_1_light": {
"fontCharacter": "\\E072",
"fontCharacter": "\\E073",
"fontColor": "#cc6d2e"
},
"_react_1": {
"fontCharacter": "\\E072",
"fontCharacter": "\\E073",
"fontColor": "#e37933"
},
"_react_2_light": {
"fontCharacter": "\\E072",
"fontCharacter": "\\E073",
"fontColor": "#b7b73b"
},
"_react_2": {
"fontCharacter": "\\E072",
"fontCharacter": "\\E073",
"fontColor": "#cbcb41"
},
"_reasonml_light": {
"fontCharacter": "\\E073",
"fontCharacter": "\\E074",
"fontColor": "#b8383d"
},
"_reasonml": {
"fontCharacter": "\\E073",
"fontCharacter": "\\E074",
"fontColor": "#cc3e44"
},
"_rmd_light": {
"fontColor": "#498ba7"
},
"_rmd": {
"fontColor": "#519aba"
},
"_rollup_light": {
"fontCharacter": "\\E074",
"fontCharacter": "\\E075",
"fontColor": "#b8383d"
},
"_rollup": {
"fontCharacter": "\\E074",
"fontCharacter": "\\E075",
"fontColor": "#cc3e44"
},
"_ruby_light": {
"fontCharacter": "\\E075",
"fontCharacter": "\\E076",
"fontColor": "#b8383d"
},
"_ruby": {
"fontCharacter": "\\E075",
"fontCharacter": "\\E076",
"fontColor": "#cc3e44"
},
"_rust_light": {
"fontCharacter": "\\E076",
"fontCharacter": "\\E077",
"fontColor": "#627379"
},
"_rust": {
"fontCharacter": "\\E076",
"fontCharacter": "\\E077",
"fontColor": "#6d8086"
},
"_salesforce_light": {
"fontCharacter": "\\E077",
"fontCharacter": "\\E078",
"fontColor": "#498ba7"
},
"_salesforce": {
"fontCharacter": "\\E077",
"fontCharacter": "\\E078",
"fontColor": "#519aba"
},
"_sass_light": {
"fontCharacter": "\\E078",
"fontCharacter": "\\E079",
"fontColor": "#dd4b78"
},
"_sass": {
"fontCharacter": "\\E078",
"fontCharacter": "\\E079",
"fontColor": "#f55385"
},
"_sbt_light": {
"fontCharacter": "\\E079",
"fontCharacter": "\\E07A",
"fontColor": "#498ba7"
},
"_sbt": {
"fontCharacter": "\\E079",
"fontCharacter": "\\E07A",
"fontColor": "#519aba"
},
"_scala_light": {
"fontCharacter": "\\E07A",
"fontCharacter": "\\E07B",
"fontColor": "#b8383d"
},
"_scala": {
"fontCharacter": "\\E07A",
"fontCharacter": "\\E07B",
"fontColor": "#cc3e44"
},
"_shell_light": {
"fontCharacter": "\\E07D",
"fontCharacter": "\\E07E",
"fontColor": "#455155"
},
"_shell": {
"fontCharacter": "\\E07D",
"fontCharacter": "\\E07E",
"fontColor": "#4d5a5e"
},
"_slim_light": {
"fontCharacter": "\\E07E",
"fontCharacter": "\\E07F",
"fontColor": "#cc6d2e"
},
"_slim": {
"fontCharacter": "\\E07E",
"fontCharacter": "\\E07F",
"fontColor": "#e37933"
},
"_smarty_light": {
"fontCharacter": "\\E07F",
"fontCharacter": "\\E080",
"fontColor": "#b7b73b"
},
"_smarty": {
"fontCharacter": "\\E07F",
"fontCharacter": "\\E080",
"fontColor": "#cbcb41"
},
"_spring_light": {
"fontCharacter": "\\E080",
"fontCharacter": "\\E081",
"fontColor": "#7fae42"
},
"_spring": {
"fontCharacter": "\\E080",
"fontCharacter": "\\E081",
"fontColor": "#8dc149"
},
"_stylelint_light": {
"fontCharacter": "\\E081",
"fontCharacter": "\\E082",
"fontColor": "#bfc2c1"
},
"_stylelint": {
"fontCharacter": "\\E081",
"fontCharacter": "\\E082",
"fontColor": "#d4d7d6"
},
"_stylelint_1_light": {
"fontCharacter": "\\E081",
"fontCharacter": "\\E082",
"fontColor": "#455155"
},
"_stylelint_1": {
"fontCharacter": "\\E081",
"fontCharacter": "\\E082",
"fontColor": "#4d5a5e"
},
"_stylus_light": {
"fontCharacter": "\\E082",
"fontCharacter": "\\E083",
"fontColor": "#7fae42"
},
"_stylus": {
"fontCharacter": "\\E082",
"fontCharacter": "\\E083",
"fontColor": "#8dc149"
},
"_sublime_light": {
"fontCharacter": "\\E083",
"fontCharacter": "\\E084",
"fontColor": "#cc6d2e"
},
"_sublime": {
"fontCharacter": "\\E083",
"fontCharacter": "\\E084",
"fontColor": "#e37933"
},
"_svg_light": {
"fontCharacter": "\\E084",
"fontCharacter": "\\E085",
"fontColor": "#9068b0"
},
"_svg": {
"fontCharacter": "\\E084",
"fontCharacter": "\\E085",
"fontColor": "#a074c4"
},
"_svg_1_light": {
"fontCharacter": "\\E084",
"fontCharacter": "\\E085",
"fontColor": "#498ba7"
},
"_svg_1": {
"fontCharacter": "\\E084",
"fontCharacter": "\\E085",
"fontColor": "#519aba"
},
"_swift_light": {
"fontCharacter": "\\E085",
"fontCharacter": "\\E086",
"fontColor": "#cc6d2e"
},
"_swift": {
"fontCharacter": "\\E085",
"fontCharacter": "\\E086",
"fontColor": "#e37933"
},
"_terraform_light": {
"fontCharacter": "\\E086",
"fontCharacter": "\\E087",
"fontColor": "#9068b0"
},
"_terraform": {
"fontCharacter": "\\E086",
"fontCharacter": "\\E087",
"fontColor": "#a074c4"
},
"_tex_light": {
"fontCharacter": "\\E087",
"fontCharacter": "\\E088",
"fontColor": "#498ba7"
},
"_tex": {
"fontCharacter": "\\E087",
"fontCharacter": "\\E088",
"fontColor": "#519aba"
},
"_tex_1_light": {
"fontCharacter": "\\E087",
"fontCharacter": "\\E088",
"fontColor": "#b7b73b"
},
"_tex_1": {
"fontCharacter": "\\E087",
"fontCharacter": "\\E088",
"fontColor": "#cbcb41"
},
"_tex_2_light": {
"fontCharacter": "\\E087",
"fontCharacter": "\\E088",
"fontColor": "#cc6d2e"
},
"_tex_2": {
"fontCharacter": "\\E087",
"fontCharacter": "\\E088",
"fontColor": "#e37933"
},
"_tex_3_light": {
"fontCharacter": "\\E087",
"fontCharacter": "\\E088",
"fontColor": "#bfc2c1"
},
"_tex_3": {
"fontCharacter": "\\E087",
"fontCharacter": "\\E088",
"fontColor": "#d4d7d6"
},
"_todo": {
"fontCharacter": "\\E089"
"fontCharacter": "\\E08A"
},
"_tsconfig_light": {
"fontCharacter": "\\E08A",
"fontCharacter": "\\E08B",
"fontColor": "#498ba7"
},
"_tsconfig": {
"fontCharacter": "\\E08A",
"fontCharacter": "\\E08B",
"fontColor": "#519aba"
},
"_twig_light": {
"fontCharacter": "\\E08B",
"fontCharacter": "\\E08C",
"fontColor": "#7fae42"
},
"_twig": {
"fontCharacter": "\\E08B",
"fontCharacter": "\\E08C",
"fontColor": "#8dc149"
},
"_typescript_light": {
"fontCharacter": "\\E08C",
"fontCharacter": "\\E08D",
"fontColor": "#498ba7"
},
"_typescript": {
"fontCharacter": "\\E08C",
"fontCharacter": "\\E08D",
"fontColor": "#519aba"
},
"_typescript_1_light": {
"fontCharacter": "\\E08C",
"fontCharacter": "\\E08D",
"fontColor": "#b7b73b"
},
"_typescript_1": {
"fontCharacter": "\\E08C",
"fontCharacter": "\\E08D",
"fontColor": "#cbcb41"
},
"_vala_light": {
"fontCharacter": "\\E08D",
"fontCharacter": "\\E08E",
"fontColor": "#627379"
},
"_vala": {
"fontCharacter": "\\E08D",
"fontCharacter": "\\E08E",
"fontColor": "#6d8086"
},
"_video_light": {
"fontCharacter": "\\E08E",
"fontCharacter": "\\E08F",
"fontColor": "#dd4b78"
},
"_video": {
"fontCharacter": "\\E08E",
"fontCharacter": "\\E08F",
"fontColor": "#f55385"
},
"_vue_light": {
"fontCharacter": "\\E08F",
"fontCharacter": "\\E090",
"fontColor": "#7fae42"
},
"_vue": {
"fontCharacter": "\\E08F",
"fontCharacter": "\\E090",
"fontColor": "#8dc149"
},
"_wasm_light": {
"fontCharacter": "\\E090",
"fontCharacter": "\\E091",
"fontColor": "#9068b0"
},
"_wasm": {
"fontCharacter": "\\E090",
"fontCharacter": "\\E091",
"fontColor": "#a074c4"
},
"_wat_light": {
"fontCharacter": "\\E091",
"fontCharacter": "\\E092",
"fontColor": "#9068b0"
},
"_wat": {
"fontCharacter": "\\E091",
"fontCharacter": "\\E092",
"fontColor": "#a074c4"
},
"_webpack_light": {
"fontCharacter": "\\E092",
"fontCharacter": "\\E093",
"fontColor": "#498ba7"
},
"_webpack": {
"fontCharacter": "\\E092",
"fontCharacter": "\\E093",
"fontColor": "#519aba"
},
"_wgt_light": {
"fontCharacter": "\\E093",
"fontCharacter": "\\E094",
"fontColor": "#498ba7"
},
"_wgt": {
"fontCharacter": "\\E093",
"fontCharacter": "\\E094",
"fontColor": "#519aba"
},
"_windows_light": {
"fontCharacter": "\\E094",
"fontCharacter": "\\E095",
"fontColor": "#498ba7"
},
"_windows": {
"fontCharacter": "\\E094",
"fontCharacter": "\\E095",
"fontColor": "#519aba"
},
"_word_light": {
"fontCharacter": "\\E095",
"fontCharacter": "\\E096",
"fontColor": "#498ba7"
},
"_word": {
"fontCharacter": "\\E095",
"fontCharacter": "\\E096",
"fontColor": "#519aba"
},
"_xls_light": {
"fontCharacter": "\\E096",
"fontCharacter": "\\E097",
"fontColor": "#7fae42"
},
"_xls": {
"fontCharacter": "\\E096",
"fontCharacter": "\\E097",
"fontColor": "#8dc149"
},
"_xml_light": {
"fontCharacter": "\\E097",
"fontCharacter": "\\E098",
"fontColor": "#cc6d2e"
},
"_xml": {
"fontCharacter": "\\E097",
"fontCharacter": "\\E098",
"fontColor": "#e37933"
},
"_yarn_light": {
"fontCharacter": "\\E098",
"fontCharacter": "\\E099",
"fontColor": "#498ba7"
},
"_yarn": {
"fontCharacter": "\\E098",
"fontCharacter": "\\E099",
"fontColor": "#519aba"
},
"_yml_light": {
"fontCharacter": "\\E099",
"fontCharacter": "\\E09A",
"fontColor": "#9068b0"
},
"_yml": {
"fontCharacter": "\\E099",
"fontCharacter": "\\E09A",
"fontColor": "#a074c4"
},
"_zip_light": {
"fontCharacter": "\\E09A",
"fontCharacter": "\\E09B",
"fontColor": "#b8383d"
},
"_zip": {
"fontCharacter": "\\E09A",
"fontCharacter": "\\E09B",
"fontColor": "#cc3e44"
},
"_zip_1_light": {
"fontCharacter": "\\E09A",
"fontCharacter": "\\E09B",
"fontColor": "#627379"
},
"_zip_1": {
"fontCharacter": "\\E09A",
"fontCharacter": "\\E09B",
"fontColor": "#6d8086"
},
// {{SQL CARBON EDIT}}
@@ -1392,6 +1406,7 @@
"edn": "_clojure_1",
"cfc": "_coldfusion",
"cfm": "_coldfusion",
"litcoffee": "_coffee",
"config": "_config",
"cfg": "_config",
"conf": "_config",
@@ -1434,6 +1449,7 @@
"hxml": "_haxe_3",
"class": "_java",
"classpath": "_java",
"properties": "_java",
"js.map": "_javascript",
"spec.js": "_javascript_1",
"test.js": "_javascript_1",
@@ -1480,6 +1496,7 @@
"test.tsx": "_react_2",
"re": "_reasonml",
"r": "_R",
"rmd": "_rmd",
"erb": "_html_erb",
"erb.html": "_html_erb",
"html.erb": "_html_erb",
@@ -1507,6 +1524,7 @@
"vue": "_vue",
"wasm": "_wasm",
"wat": "_wat",
"pro": "_prolog",
"jar": "_zip",
"zip": "_zip_1",
"wgt": "_wgt",
@@ -1545,6 +1563,8 @@
"obj": "_svg_1",
"dae": "_svg_1",
"babelrc": "_babel",
"babelrc.js": "_babel",
"babelrc.cjs": "_babel",
"bowerrc": "_bower",
"dockerignore": "_docker_1",
"codeclimate.yml": "_code-climate",
@@ -1588,12 +1608,14 @@
"version.md": "_clock",
"version": "_clock",
"mvnw": "_maven",
"tsconfig.json": "_tsconfig",
"swagger.json": "_json_1",
"swagger.yml": "_json_1",
"swagger.yaml": "_json_1",
"mime.types": "_config",
"jenkinsfile": "_jenkins",
"babel.config.js": "_babel",
"babel.config.json": "_babel",
"babel.config.cjs": "_babel",
"bower.json": "_bower",
"docker-healthcheck": "_docker_2",
"docker-compose.yml": "_docker_3",
@@ -1606,6 +1628,7 @@
"gruntfile.babel.js": "_grunt",
"gruntfile.coffee": "_grunt",
"gulpfile": "_gulp",
"gulpfile.js": "_gulp",
"ionic.config.json": "_ionic",
"ionic.project": "_ionic",
"platformio.ini": "_platformio",
@@ -1649,7 +1672,6 @@
"groovy": "_grails",
"handlebars": "_mustache",
"html": "_html_3",
"properties": "_java",
"java": "_java",
"javascriptreact": "_react",
"javascript": "_javascript",
@@ -1699,7 +1721,9 @@
"todo": "_todo",
// {{SQL CARBON EDIT}}
"notebook": "notebook_dark",
"scmp": "scmp_dark"
"scmp": "scmp_dark",
"postcss": "_css",
"django-html": "_html_3"
},
"light": {
"file": "_default_light",
@@ -1719,6 +1743,7 @@
"edn": "_clojure_1_light",
"cfc": "_coldfusion_light",
"cfm": "_coldfusion_light",
"litcoffee": "_coffee_light",
"config": "_config_light",
"cfg": "_config_light",
"conf": "_config_light",
@@ -1761,6 +1786,7 @@
"hxml": "_haxe_3_light",
"class": "_java_light",
"classpath": "_java_light",
"properties": "_java_light",
"js.map": "_javascript_light",
"spec.js": "_javascript_1_light",
"test.js": "_javascript_1_light",
@@ -1807,6 +1833,7 @@
"test.tsx": "_react_2_light",
"re": "_reasonml_light",
"r": "_R_light",
"rmd": "_rmd_light",
"erb": "_html_erb_light",
"erb.html": "_html_erb_light",
"html.erb": "_html_erb_light",
@@ -1834,6 +1861,7 @@
"vue": "_vue_light",
"wasm": "_wasm_light",
"wat": "_wat_light",
"pro": "_prolog_light",
"jar": "_zip_light",
"zip": "_zip_1_light",
"wgt": "_wgt_light",
@@ -1872,6 +1900,8 @@
"obj": "_svg_1_light",
"dae": "_svg_1_light",
"babelrc": "_babel_light",
"babelrc.js": "_babel_light",
"babelrc.cjs": "_babel_light",
"bowerrc": "_bower_light",
"dockerignore": "_docker_1_light",
"codeclimate.yml": "_code-climate_light",
@@ -1919,7 +1949,6 @@
"groovy": "_grails_light",
"handlebars": "_mustache_light",
"html": "_html_3_light",
"properties": "_java_light",
"java": "_java_light",
"javascriptreact": "_react_light",
"javascript": "_javascript_light",
@@ -1968,7 +1997,9 @@
"vala": "_vala_light",
// {{SQL CARBON EDIT}}
"notebook": "notebook",
"scmp": "scmp"
"scmp": "scmp",
"postcss": "_css_light",
"django-html": "_html_3_light"
},
"fileNames": {
"mix": "_hex_light",
@@ -1981,12 +2012,14 @@
"version.md": "_clock_light",
"version": "_clock_light",
"mvnw": "_maven_light",
"tsconfig.json": "_tsconfig_light",
"swagger.json": "_json_1_light",
"swagger.yml": "_json_1_light",
"swagger.yaml": "_json_1_light",
"mime.types": "_config_light",
"jenkinsfile": "_jenkins_light",
"babel.config.js": "_babel_light",
"babel.config.json": "_babel_light",
"babel.config.cjs": "_babel_light",
"bower.json": "_bower_light",
"docker-healthcheck": "_docker_2_light",
"docker-compose.yml": "_docker_3_light",
@@ -1999,6 +2032,7 @@
"gruntfile.babel.js": "_grunt_light",
"gruntfile.coffee": "_grunt_light",
"gulpfile": "_gulp_light",
"gulpfile.js": "_gulp_light",
"ionic.config.json": "_ionic_light",
"ionic.project": "_ionic_light",
"platformio.ini": "_platformio_light",
@@ -2027,5 +2061,5 @@
"Schema Compare": "scmp"
}
},
"version": "https://github.com/jesseweed/seti-ui/commit/4b3e0a3d0ca8999430bc3aa9f2c8324e6922b3de"
}
"version": "https://github.com/jesseweed/seti-ui/commit/8f22764c37feb7f706465f5186132111a2401b6b"
}
extensions/vscode-account/src/AADHelper.ts
+4
View File
@@ -317,6 +317,10 @@ export class AzureActiveDirectoryService {
}
private getCallbackEnvironment(callbackUri: vscode.Uri): string {
if (callbackUri.authority.endsWith('.workspaces.github.com')) {
return `${callbackUri.authority},`;
}
switch (callbackUri.authority) {
case 'online.visualstudio.com':
return 'vso,';