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

remove some vscode differences (#12146)

Browse Source
This commit is contained in:
Anthony Dresser
2020-09-04 18:04:30 -07:00
committed by GitHub
parent 503090856a
commit 704222b8d7
31 changed files with 1118 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
View File

@@ -306,7 +306,7 @@ export class SimpleFileDialog {
this.filePickBox.onDidCustom(() => {
if (isAcceptHandled || this.busy) {
return undefined; // {{SQL CARBON EDIT}} @todo anthonydresser return to return; when we do strict null checks
return undefined; // {{SQL CARBON EDIT}} @todo anthonydresser return to return; when we do strict-null-checks
}
isAcceptHandled = true;

2
src/vs/workbench/services/search/node/ripgrepFileSearch.ts
View File

@@ -145,7 +145,7 @@ function globExprsToRgGlobs(patterns: glob.IExpression, folder?: string, exclude
}
globArgs.push(fixDriveC(key));
// {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 cast value because we aren't using strict null checks
// {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 cast value because we aren't using strict-null-checks
} else if (value && (<glob.SiblingClause>value).when) {
siblingClauses[key] = value;
}

5
src/vs/workbench/services/themes/browser/workbenchThemeService.ts
View File

@@ -37,12 +37,11 @@ import { isWeb } from 'vs/base/common/platform';
// implementation
const DEFAULT_COLOR_THEME_ID = 'vs sql-theme-carbon-themes-light_carbon-json';
const DEFAULT_COLOR_THEME_ID = 'vs sql-theme-carbon-themes-light_carbon-json'; // {{SQL CARBON EDIT}}
const PERSISTED_OS_COLOR_SCHEME = 'osColorScheme';
// {{SQL CARBON EDIT}}
const defaultThemeExtensionId = 'sql-theme-carbon';
const defaultThemeExtensionId = 'sql-theme-carbon';// {{SQL CARBON EDIT}}
const oldDefaultThemeExtensionId = 'vscode-theme-colorful-defaults';
const DEFAULT_FILE_ICON_THEME_ID = 'vscode.vscode-theme-seti-vs-seti';

2
src/vs/workbench/services/themes/common/themeConfiguration.ts
View File

@@ -33,7 +33,7 @@ const colorThemeSettingEnumDescriptions: string[] = [];
const colorThemeSettingSchema: IConfigurationPropertySchema = {
type: 'string',
description: nls.localize('colorTheme', "Specifies the color theme used in the workbench."),
default: isWeb ? DEFAULT_THEME_LIGHT_SETTING_VALUE : DEFAULT_THEME_LIGHT_SETTING_VALUE,
default: isWeb ? DEFAULT_THEME_LIGHT_SETTING_VALUE : DEFAULT_THEME_LIGHT_SETTING_VALUE, // {{SQL CARBON EDIT}}
enum: colorThemeSettingEnum,
enumDescriptions: colorThemeSettingEnumDescriptions,
errorMessage: nls.localize('colorThemeError', "Theme is unknown or not installed."),