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

normalize sql carbon tag (#14445)

Browse Source
This commit is contained in:
Aditya Bist
2021-02-25 13:32:12 -08:00
committed by GitHub
parent b28e845506
commit 2a125ee43b
35 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/hygiene.js
View File

@@ -30,7 +30,7 @@ const all = [
'test/**/*', 'test/**/*',
'!test/**/out/**', '!test/**/out/**',
'!**/node_modules/**', '!**/node_modules/**',
'!build/actions/**/*.js', // {{ SQL CARBON EDIT }} '!build/actions/**/*.js', // {{SQL CARBON EDIT}}
'!build/**/*' // {{SQL CARBON EDIT}} '!build/**/*' // {{SQL CARBON EDIT}}
]; ];
module.exports.all = all; module.exports.all = all;

4
extensions/markdown-language-features/src/commands/openDocumentLink.ts
View File

@@ -10,7 +10,7 @@ import { Command } from '../commandManager';
import { MarkdownEngine } from '../markdownEngine'; import { MarkdownEngine } from '../markdownEngine';
import { TableOfContentsProvider } from '../tableOfContentsProvider'; import { TableOfContentsProvider } from '../tableOfContentsProvider';
import { isMarkdownFile } from '../util/file'; import { isMarkdownFile } from '../util/file';
import { isString } from 'util'; // {{ SQL CARBON EDIT }} import { isString } from 'util'; // {{SQL CARBON EDIT}}
type UriComponents = { type UriComponents = {
@@ -154,7 +154,7 @@ export class OpenDocumentLinkCommand implements Command {
} }
function reviveUri(parts: any) { function reviveUri(parts: any) {
if (parts.scheme === 'file' && isString(parts.path)) { // {{ SQL CARBON EDIT }} Fix markdown relative links https://github.com/microsoft/azuredatastudio/issues/11657 if (parts.scheme === 'file' && isString(parts.path)) { // {{SQL CARBON EDIT}} Fix markdown relative links https://github.com/microsoft/azuredatastudio/issues/11657
return vscode.Uri.file(parts.path); return vscode.Uri.file(parts.path);
} }
return vscode.Uri.parse('').with(parts); return vscode.Uri.parse('').with(parts);

2
extensions/notebook/yarn.lock
View File

@@ -1756,7 +1756,7 @@ uri-js@^4.2.2:
dependencies: dependencies:
punycode "^2.1.0" punycode "^2.1.0"
url-parse@^1.5.0, url-parse@~1.4.3: url-parse@^1.5.1, url-parse@~1.4.3:
version "1.5.1" version "1.5.1"
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q== integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==

2
src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
View File

@@ -689,7 +689,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
} }
}); });
container.innerHTML = this.options[longest]?.text + (!!this.options[longest]?.decoratorRight ? (this.options[longest].decoratorRight + ' ') : ''); // {{ SQL CARBON EDIT }} Don't error if no option found (empty list) container.innerHTML = this.options[longest]?.text + (!!this.options[longest]?.decoratorRight ? (this.options[longest].decoratorRight + ' ') : ''); // {{SQL CARBON EDIT}} Don't error if no option found (empty list)
elementWidth = dom.getTotalWidth(container); elementWidth = dom.getTotalWidth(container);
} }

4
src/vs/base/parts/tree/browser/treeImpl.ts
View File

@@ -189,7 +189,7 @@ export class Tree implements _.ITree {
return this.model.reveal(element, relativeTop); return this.model.reveal(element, relativeTop);
} }
// {{SQL CARBON EDIT }} - add back deleted VS Code tree methods // {{SQL CARBON EDIT}} - add back deleted VS Code tree methods
public getExpandedElements(): any[] { public getExpandedElements(): any[] {
return this.model.getExpandedElements(); return this.model.getExpandedElements();
} }
@@ -205,7 +205,7 @@ export class Tree implements _.ITree {
getContentHeight(): number { getContentHeight(): number {
return this.view.getContentHeight(); return this.view.getContentHeight();
} }
// {{SQL CARBON EDIT }} - end block // {{SQL CARBON EDIT}} - end block
public getHighlight(): any { public getHighlight(): any {

6
src/vs/base/test/browser/dom.test.ts
View File

@@ -8,7 +8,7 @@ import * as dom from 'vs/base/browser/dom';
const $ = dom.$; const $ = dom.$;
suite('dom', () => { suite('dom', () => {
test.skip('hasClass', () => { //{{SQL CARBON EDIT}} skip test test.skip('hasClass', () => { // {{SQL CARBON EDIT}} skip test
let element = document.createElement('div'); let element = document.createElement('div');
element.className = 'foobar boo far'; element.className = 'foobar boo far';
@@ -21,7 +21,7 @@ suite('dom', () => {
assert(!element.classList.contains('')); assert(!element.classList.contains(''));
}); });
test.skip('removeClass', () => { //{{SQL CARBON EDIT}} skip test test.skip('removeClass', () => { // {{SQL CARBON EDIT}} skip test
let element = document.createElement('div'); let element = document.createElement('div');
element.className = 'foobar boo far'; element.className = 'foobar boo far';
@@ -54,7 +54,7 @@ suite('dom', () => {
assert.equal(element.className, ''); assert.equal(element.className, '');
}); });
test.skip('removeClass should consider hyphens', function () { //{{SQL CARBON EDIT}} skip test test.skip('removeClass should consider hyphens', function () { // {{SQL CARBON EDIT}} skip test
let element = document.createElement('div'); let element = document.createElement('div');
element.classList.add('foo-bar'); element.classList.add('foo-bar');

2
src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
View File

@@ -90,7 +90,7 @@ interface ISharedProcessInitData {
backupWorkspacesPath: string; backupWorkspacesPath: string;
} }
const eventPrefix = 'adsworkbench'; // {{ SQL CARBON EDIT }} const eventPrefix = 'adsworkbench'; // {{SQL CARBON EDIT}}
class MainProcessService implements IMainProcessService { class MainProcessService implements IMainProcessService {

2
src/vs/code/electron-browser/workbench/workbench.js
View File

@@ -20,7 +20,7 @@
// we know for a fact that workbench.desktop.main will depend on // we know for a fact that workbench.desktop.main will depend on
// the related CSS and NLS counterparts. // the related CSS and NLS counterparts.
bootstrapWindow.load([ bootstrapWindow.load([
'sql/setup', // {{ SQL CARBON EDIT }} 'sql/setup', // {{SQL CARBON EDIT}}
'vs/workbench/workbench.desktop.main', 'vs/workbench/workbench.desktop.main',
'vs/nls!vs/workbench/workbench.desktop.main', 'vs/nls!vs/workbench/workbench.desktop.main',
'vs/css!vs/workbench/workbench.desktop.main' 'vs/css!vs/workbench/workbench.desktop.main'

2
src/vs/code/electron-sandbox/issue/issueReporterMain.ts
View File

@@ -864,7 +864,7 @@ export class IssueReporter extends Disposable {
} }
} }
const queryStringPrefix = repositoryUrl && repositoryUrl.indexOf('?') === -1 ? '?' : '&'; // {{ SQL CARBON EDIT }} const queryStringPrefix = repositoryUrl && repositoryUrl.indexOf('?') === -1 ? '?' : '&'; // {{SQL CARBON EDIT}}
return `${repositoryUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`; return `${repositoryUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
} }

4
src/vs/code/electron-sandbox/issue/test/testReporterModel.test.ts
View File

@@ -80,7 +80,7 @@ OS version: undefined
<!-- generated by issue reporter -->`); <!-- generated by issue reporter -->`);
}); });
test.skip('serializes Linux environment information when data is provided', () => { //{{SQL CARBON EDIT}} skip test test.skip('serializes Linux environment information when data is provided', () => { // {{SQL CARBON EDIT}} skip test
const issueReporterModel = new IssueReporterModel({ const issueReporterModel = new IssueReporterModel({
issueType: 0, issueType: 0,
systemInfo: { systemInfo: {
@@ -129,7 +129,7 @@ OS version: undefined
<!-- generated by issue reporter -->`); <!-- generated by issue reporter -->`);
}); });
test.skip('serializes remote information when data is provided', () => { //{{SQL CARBON EDIT}} skip test test.skip('serializes remote information when data is provided', () => { // {{SQL CARBON EDIT}} skip test
const issueReporterModel = new IssueReporterModel({ const issueReporterModel = new IssueReporterModel({
issueType: 0, issueType: 0,
systemInfo: { systemInfo: {

2
src/vs/editor/contrib/suggest/test/suggestModel.test.ts
View File

@@ -819,7 +819,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
provideCompletionItems(doc, pos) { provideCompletionItems(doc, pos) {
countB += 1; countB += 1;
if (!doc.getWordUntilPosition(pos).word.startsWith('a')) { if (!doc.getWordUntilPosition(pos).word.startsWith('a')) {
// {{ SQL CARBON EDIT }} strict null checks // {{SQL CARBON EDIT}} strict null checks
return undefined; return undefined;
} }
return { return {

2
src/vs/platform/contextkey/common/contextkey.ts
View File

@@ -59,7 +59,7 @@ export interface IContextKeyExpression {
export type ContextKeyExpression = ( export type ContextKeyExpression = (
ContextKeyFalseExpr | ContextKeyTrueExpr | ContextKeyDefinedExpr | ContextKeyNotExpr ContextKeyFalseExpr | ContextKeyTrueExpr | ContextKeyDefinedExpr | ContextKeyNotExpr
| ContextKeyEqualsExpr | ContextKeyNotEqualsExpr | ContextKeyRegexExpr | ContextKeyEqualsExpr | ContextKeyNotEqualsExpr | ContextKeyRegexExpr
| ContextKeyNotRegexExpr | ContextKeyAndExpr | ContextKeyOrExpr | ContextKeyInExpr | ContextKeyNotInExpr | ContextKeyGreaterThanEqualsExpr | ContextKeyLessThanEqualsExpr // {{ SQL CARBON EDIT }} | ContextKeyNotRegexExpr | ContextKeyAndExpr | ContextKeyOrExpr | ContextKeyInExpr | ContextKeyNotInExpr | ContextKeyGreaterThanEqualsExpr | ContextKeyLessThanEqualsExpr // {{SQL CARBON EDIT}}
); );
export abstract class ContextKeyExpr { export abstract class ContextKeyExpr {

2
src/vs/platform/extensionManagement/common/extensionGalleryService.ts
View File

@@ -572,7 +572,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
return galleryExtensions.map((e, index) => toExtension(e, e.versions[0], index, nextPageQuery, options.source)); return galleryExtensions.map((e, index) => toExtension(e, e.versions[0], index, nextPageQuery, options.source));
}; };
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
return { firstPage: extensions, total, pageSize: extensions.length, getPage } as IPager<IGalleryExtension>; return { firstPage: extensions, total, pageSize: extensions.length, getPage } as IPager<IGalleryExtension>;
} }

8
src/vs/platform/extensionManagement/node/extensionManagementService.ts
View File

@@ -161,7 +161,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
const manifest = await getManifest(zipPath); const manifest = await getManifest(zipPath);
const identifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) }; const identifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) };
// let operation: InstallOperation = InstallOperation.Install; {{ SQL CARBON EDIT }} // let operation: InstallOperation = InstallOperation.Install; {{ SQL CARBON EDIT }}
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
if (manifest.engines?.vscode && !isEngineValid(manifest.engines.vscode, product.vscodeVersion)) { if (manifest.engines?.vscode && !isEngineValid(manifest.engines.vscode, product.vscodeVersion)) {
throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with the current VS Code engine version '{1}'.", identifier.id, product.vscodeVersion)); throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with the current VS Code engine version '{1}'.", identifier.id, product.vscodeVersion));
} }
@@ -213,7 +213,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
}, },
error => { this._onDidInstallExtension.fire({ identifier, zipPath, error, operation: InstallOperation.Install }); return Promise.reject(error); } error => { this._onDidInstallExtension.fire({ identifier, zipPath, error, operation: InstallOperation.Install }); return Promise.reject(error); }
); );
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
// let metadata: IGalleryMetadata | undefined; // let metadata: IGalleryMetadata | undefined;
// try { // try {
// metadata = await this.getGalleryMetadata(getGalleryExtensionId(manifest.publisher, manifest.name)); // metadata = await this.getGalleryMetadata(getGalleryExtensionId(manifest.publisher, manifest.name));
@@ -242,7 +242,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
return downloadedLocation; return downloadedLocation;
} }
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
/*private async installFromZipPath(identifierWithVersion: ExtensionIdentifierWithVersion, zipPath: string, metadata: IMetadata | undefined, operation: InstallOperation, token: CancellationToken): Promise<ILocalExtension> { /*private async installFromZipPath(identifierWithVersion: ExtensionIdentifierWithVersion, zipPath: string, metadata: IMetadata | undefined, operation: InstallOperation, token: CancellationToken): Promise<ILocalExtension> {
try { try {
const local = await this.installExtension({ zipPath, identifierWithVersion, metadata }, token); const local = await this.installExtension({ zipPath, identifierWithVersion, metadata }, token);
@@ -521,7 +521,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
return local; return local;
} }
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
/*private async getGalleryMetadata(extensionName: string): Promise<IGalleryMetadata | undefined> { /*private async getGalleryMetadata(extensionName: string): Promise<IGalleryMetadata | undefined> {
const galleryExtension = await this.findGalleryExtensionByName(extensionName); const galleryExtension = await this.findGalleryExtensionByName(extensionName);
return galleryExtension ? <IGalleryMetadata>{ id: galleryExtension.identifier.uuid, publisherDisplayName: galleryExtension.publisherDisplayName, publisherId: galleryExtension.publisherId } : undefined; return galleryExtension ? <IGalleryMetadata>{ id: galleryExtension.identifier.uuid, publisherDisplayName: galleryExtension.publisherDisplayName, publisherId: galleryExtension.publisherId } : undefined;

4
src/vs/platform/extensions/common/extensions.ts
View File

@@ -181,7 +181,7 @@ export interface IExtensionManifest {
readonly publisher: string; readonly publisher: string;
readonly version: string; readonly version: string;
readonly engines: { vscode: string; azdata?: string }; // {{SQL CARBON EDIT}} add field readonly engines: { vscode: string; azdata?: string }; // {{SQL CARBON EDIT}} add field
readonly forceReload?: boolean; // {{ SQL CARBON EDIT }} add field readonly forceReload?: boolean; // {{SQL CARBON EDIT}} add field
readonly description?: string; readonly description?: string;
readonly main?: string; readonly main?: string;
readonly browser?: string; readonly browser?: string;
@@ -278,7 +278,7 @@ export interface IExtensionDescription extends IExtensionManifest {
readonly isUnderDevelopment: boolean; readonly isUnderDevelopment: boolean;
readonly extensionLocation: URI; readonly extensionLocation: URI;
enableProposedApi?: boolean; enableProposedApi?: boolean;
readonly forceReload?: boolean; // {{ SQL CARBON EDIT }} readonly forceReload?: boolean; // {{SQL CARBON EDIT}}
} }
export function isLanguagePackExtension(manifest: IExtensionManifest): boolean { export function isLanguagePackExtension(manifest: IExtensionManifest): boolean {

8
src/vs/workbench/api/browser/mainThreadQuickOpen.ts
View File

@@ -37,14 +37,14 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
} }
$show(instance: number, options: IPickOptions<TransferQuickPickItems>, token: CancellationToken): Promise<number | number[] | undefined> { $show(instance: number, options: IPickOptions<TransferQuickPickItems>, token: CancellationToken): Promise<number | number[] | undefined> {
// {{ SQL CARBON EDIT }} Fix a11y issue https://github.com/microsoft/azuredatastudio/issues/9232 // {{SQL CARBON EDIT}} Fix a11y issue https://github.com/microsoft/azuredatastudio/issues/9232
const activeElement = document.activeElement as HTMLElement; const activeElement = document.activeElement as HTMLElement;
const focusBackToStartingPosition = () => { const focusBackToStartingPosition = () => {
try { try {
activeElement?.focus(); activeElement?.focus();
} catch { } } catch { }
}; };
// {{ SQL CARBON EDIT }} Fix a11y issue https://github.com/microsoft/azuredatastudio/issues/9232 // {{SQL CARBON EDIT}} Fix a11y issue https://github.com/microsoft/azuredatastudio/issues/9232
const contents = new Promise<TransferQuickPickItems[]>((resolve, reject) => { const contents = new Promise<TransferQuickPickItems[]>((resolve, reject) => {
this._items[instance] = { resolve, reject }; this._items[instance] = { resolve, reject };
@@ -61,7 +61,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
if (options.canPickMany) { if (options.canPickMany) {
return this._quickInputService.pick(contents, options as { canPickMany: true }, token).then(items => { return this._quickInputService.pick(contents, options as { canPickMany: true }, token).then(items => {
focusBackToStartingPosition(); // {{ SQL CARBON EDIT }} Fix a11y issue https://github.com/microsoft/azuredatastudio/issues/9232 focusBackToStartingPosition(); // {{SQL CARBON EDIT}} Fix a11y issue https://github.com/microsoft/azuredatastudio/issues/9232
if (items) { if (items) {
return items.map(item => item.handle); return items.map(item => item.handle);
} }
@@ -69,7 +69,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
}); });
} else { } else {
return this._quickInputService.pick(contents, options, token).then(item => { return this._quickInputService.pick(contents, options, token).then(item => {
focusBackToStartingPosition(); // {{ SQL CARBON EDIT }} Fix a11y issue https://github.com/microsoft/azuredatastudio/issues/9232 focusBackToStartingPosition(); // {{SQL CARBON EDIT}} Fix a11y issue https://github.com/microsoft/azuredatastudio/issues/9232
if (item) { if (item) {
return item.handle; return item.handle;
} }

2
src/vs/workbench/api/browser/mainThreadTreeViews.ts
View File

@@ -228,7 +228,7 @@ export class TreeViewDataProvider implements ITreeViewDataProvider {
} }
protected async postGetChildren(elements: ITreeItem[]): Promise<ITreeItem[]> { // {{SQL CARBON EDIT}} For use by Component Tree View protected async postGetChildren(elements: ITreeItem[]): Promise<ITreeItem[]> { // {{SQL CARBON EDIT}} For use by Component Tree View
const result: ITreeItem[] = []; //{{SQL CARBON EDIT}} const result: ITreeItem[] = []; // {{SQL CARBON EDIT}}
const hasResolve = await this.hasResolve; const hasResolve = await this.hasResolve;
if (elements) { if (elements) {
for (const element of elements) { for (const element of elements) {

4
src/vs/workbench/api/common/extHostApiCommands.ts
View File

@@ -305,7 +305,7 @@ const newCommands: ApiCommand[] = [
ApiCommandArgument.Uri, ApiCommandArgument.Uri,
new ApiCommandArgument<vscode.ViewColumn | typeConverters.TextEditorOpenOptions | undefined, [number?, ITextEditorOptions?] | undefined>('columnOrOptions', 'Either the column in which to open or editor options, see vscode.TextDocumentShowOptions', new ApiCommandArgument<vscode.ViewColumn | typeConverters.TextEditorOpenOptions | undefined, [number?, ITextEditorOptions?] | undefined>('columnOrOptions', 'Either the column in which to open or editor options, see vscode.TextDocumentShowOptions',
v => v === undefined || typeof v === 'number' || typeof v === 'object', v => v === undefined || typeof v === 'number' || typeof v === 'object',
v => <any>(!v ? v : typeof v === 'number' ? [v, undefined] : [typeConverters.ViewColumn.from(v.viewColumn), typeConverters.TextEditorOpenOptions.from(v)]) // {{ SQL CARBON EDIT }} Fixing type mismatch causing build break. v => <any>(!v ? v : typeof v === 'number' ? [v, undefined] : [typeConverters.ViewColumn.from(v.viewColumn), typeConverters.TextEditorOpenOptions.from(v)]) // {{SQL CARBON EDIT}} Fixing type mismatch causing build break.
).optional(), ).optional(),
ApiCommandArgument.String.with('label', '').optional() ApiCommandArgument.String.with('label', '').optional()
], ],
@@ -318,7 +318,7 @@ const newCommands: ApiCommand[] = [
ApiCommandArgument.String.with('viewId', 'Custom editor view id or \'default\' to use VS Code\'s default editor'), ApiCommandArgument.String.with('viewId', 'Custom editor view id or \'default\' to use VS Code\'s default editor'),
new ApiCommandArgument<vscode.ViewColumn | typeConverters.TextEditorOpenOptions | undefined, [number?, ITextEditorOptions?] | undefined>('columnOrOptions', 'Either the column in which to open or editor options, see vscode.TextDocumentShowOptions', new ApiCommandArgument<vscode.ViewColumn | typeConverters.TextEditorOpenOptions | undefined, [number?, ITextEditorOptions?] | undefined>('columnOrOptions', 'Either the column in which to open or editor options, see vscode.TextDocumentShowOptions',
v => v === undefined || typeof v === 'number' || typeof v === 'object', v => v === undefined || typeof v === 'number' || typeof v === 'object',
v => <any>(!v ? v : typeof v === 'number' ? [v, undefined] : [typeConverters.ViewColumn.from(v.viewColumn), typeConverters.TextEditorOpenOptions.from(v)]), // {{ SQL CARBON EDIT }} Fixing type mismatch causing build break. v => <any>(!v ? v : typeof v === 'number' ? [v, undefined] : [typeConverters.ViewColumn.from(v.viewColumn), typeConverters.TextEditorOpenOptions.from(v)]), // {{SQL CARBON EDIT}} Fixing type mismatch causing build break.
).optional() ).optional()
], ],
ApiCommandResult.Void ApiCommandResult.Void

2
src/vs/workbench/api/common/extHostRequireInterceptor.ts
View File

@@ -27,7 +27,7 @@ interface LoadFunction {
(request: string): any; (request: string): any;
} }
export interface INodeModuleFactory { //{{SQL CARBON EDIT}} export interface export interface INodeModuleFactory { // {{SQL CARBON EDIT}} export interface
readonly nodeModuleName: string | string[]; readonly nodeModuleName: string | string[];
load(request: string, parent: URI, original: LoadFunction): any; load(request: string, parent: URI, original: LoadFunction): any;
alternativeModuleName?(name: string): string | undefined; alternativeModuleName?(name: string): string | undefined;

2
src/vs/workbench/api/common/extHostTerminalService.ts
View File

@@ -292,7 +292,7 @@ export class ExtHostPseudoterminal implements ITerminalChildProcess {
}); });
} }
if (this._pty.onDidOverrideDimensions) { if (this._pty.onDidOverrideDimensions) {
this._pty.onDidOverrideDimensions(e => this._onProcessOverrideDimensions.fire(e ? { cols: e.columns, rows: e.rows } : undefined)); // {{SQL CARBONEDIT}} strict-null-checks this._pty.onDidOverrideDimensions(e => this._onProcessOverrideDimensions.fire(e ? { cols: e.columns, rows: e.rows } : undefined)); // {{SQL CARBON EDIT}} strict-null-checks
} }
this._pty.open(initialDimensions ? initialDimensions : undefined); this._pty.open(initialDimensions ? initialDimensions : undefined);

2
src/vs/workbench/api/common/extHostTreeViews.ts
View File

@@ -588,7 +588,7 @@ export class ExtHostTreeView<T> extends Disposable {
const disposable = new DisposableStore(); const disposable = new DisposableStore();
const handle = this.createHandle(element, extensionTreeItem, parent); const handle = this.createHandle(element, extensionTreeItem, parent);
const icon = this.getLightIconPath(extensionTreeItem); const icon = this.getLightIconPath(extensionTreeItem);
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
const item = { const item = {
handle, handle,
parentHandle: parent ? parent.item.handle : undefined, parentHandle: parent ? parent.item.handle : undefined,

2
src/vs/workbench/api/node/extHostTask.ts
View File

@@ -161,7 +161,7 @@ export class ExtHostTask extends ExtHostTaskBase {
paths paths
); );
} }
return result;*/ // {{ SQL CARBON EDIT }} return result;*/ // {{SQL CARBON EDIT}}
return undefined; return undefined;
} }

2
src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
View File

@@ -44,7 +44,7 @@ import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
import { CATEGORIES } from 'vs/workbench/common/actions'; import { CATEGORIES } from 'vs/workbench/common/actions';
import { registerIcon } from 'vs/platform/theme/common/iconRegistry'; import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
import { AccountsActionViewItem } from 'sql/workbench/browser/parts/activitybar/activitybarActions'; // {{ SQL CARBON EDIT }} - use the ADS account management action import { AccountsActionViewItem } from 'sql/workbench/browser/parts/activitybar/activitybarActions'; // {{SQL CARBON EDIT}} - use the ADS account management action
interface IPlaceholderViewContainer { interface IPlaceholderViewContainer {
readonly id: string; readonly id: string;

2
src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts
View File

@@ -23,7 +23,7 @@ import { ConfigBasedRecommendations } from 'vs/workbench/contrib/extensions/brow
import { StaticRecommendations } from 'sql/workbench/contrib/extensions/browser/staticRecommendations'; import { StaticRecommendations } from 'sql/workbench/contrib/extensions/browser/staticRecommendations';
import { ScenarioRecommendations } from 'sql/workbench/contrib/extensions/browser/scenarioRecommendations'; import { ScenarioRecommendations } from 'sql/workbench/contrib/extensions/browser/scenarioRecommendations';
import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations'; import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
import { IExtensionRecommendation } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; // {{ SQL CARBON EDIT }} import { IExtensionRecommendation } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; // {{SQL CARBON EDIT}}
type IgnoreRecommendationClassification = { type IgnoreRecommendationClassification = {
recommendationReason: { classification: 'SystemMetaData', purpose: 'FeatureInsight', isMeasurement: true }; recommendationReason: { classification: 'SystemMetaData', purpose: 'FeatureInsight', isMeasurement: true };

2
src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
View File

@@ -24,7 +24,7 @@ import {
/*RecentlyPublishedExtensionsAction, */ShowInstalledExtensionsAction, ShowOutdatedExtensionsAction, ShowDisabledExtensionsAction, /*RecentlyPublishedExtensionsAction, */ShowInstalledExtensionsAction, ShowOutdatedExtensionsAction, ShowDisabledExtensionsAction,
ShowEnabledExtensionsAction, PredefinedExtensionFilterAction, RefreshExtensionsAction ShowEnabledExtensionsAction, PredefinedExtensionFilterAction, RefreshExtensionsAction
} from 'vs/workbench/contrib/extensions/browser/extensionsActions'; } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
import { OpenExtensionAuthoringDocsAction } from 'sql/workbench/contrib/extensions/browser/extensionsActions'; // {{ SQL CARBON EDIT }} import { OpenExtensionAuthoringDocsAction } from 'sql/workbench/contrib/extensions/browser/extensionsActions'; // {{SQL CARBON EDIT}}
import { IExtensionManagementService, IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement'; import { IExtensionManagementService, IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput'; import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';

4
src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
View File

@@ -31,14 +31,14 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer'; import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { coalesce, distinct, flatten } from 'vs/base/common/arrays'; // {{ SQL CARBON EDIT }} import { coalesce, distinct, flatten } from 'vs/base/common/arrays'; // {{SQL CARBON EDIT}}
import { IExperimentService, IExperiment, ExperimentActionType } from 'vs/workbench/contrib/experiments/common/experimentService'; import { IExperimentService, IExperiment, ExperimentActionType } from 'vs/workbench/contrib/experiments/common/experimentService';
import { alert } from 'vs/base/browser/ui/aria/aria'; import { alert } from 'vs/base/browser/ui/aria/aria';
import { IListContextMenuEvent } from 'vs/base/browser/ui/list/list'; import { IListContextMenuEvent } from 'vs/base/browser/ui/list/list';
import { createErrorWithActions } from 'vs/base/common/errorsWithActions'; import { createErrorWithActions } from 'vs/base/common/errorsWithActions';
import { CancellationToken } from 'vs/base/common/cancellation'; import { CancellationToken } from 'vs/base/common/cancellation';
import { IAction, Action, Separator } from 'vs/base/common/actions'; import { IAction, Action, Separator } from 'vs/base/common/actions';
import { ExtensionIdentifier, ExtensionType, IExtensionDescription, isLanguagePackExtension } from 'vs/platform/extensions/common/extensions'; // {{ SQL CARBON EDIT }} import { ExtensionIdentifier, ExtensionType, IExtensionDescription, isLanguagePackExtension } from 'vs/platform/extensions/common/extensions'; // {{SQL CARBON EDIT}}
import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async'; import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
import { IProductService } from 'vs/platform/product/common/productService'; import { IProductService } from 'vs/platform/product/common/productService';
import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon'; import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon';

8
src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
View File

@@ -244,13 +244,13 @@ registerAction2(class extends NotebookCellAction<ICellRange> {
getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange): INotebookCellActionContext | undefined { getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange): INotebookCellActionContext | undefined {
if (!context || typeof context.start !== 'number' || typeof context.end !== 'number' || context.start >= context.end) { if (!context || typeof context.start !== 'number' || typeof context.end !== 'number' || context.start >= context.end) {
return undefined; // {{ SQL CARBON EDIT }} return undefined; // {{SQL CARBON EDIT}}
} }
const activeEditorContext = this.getActiveEditorContext(accessor); const activeEditorContext = this.getActiveEditorContext(accessor);
if (!activeEditorContext || !activeEditorContext.notebookEditor.viewModel || context.start >= activeEditorContext.notebookEditor.viewModel.viewCells.length) { if (!activeEditorContext || !activeEditorContext.notebookEditor.viewModel || context.start >= activeEditorContext.notebookEditor.viewModel.viewCells.length) {
return undefined; // {{ SQL CARBON EDIT }} return undefined; // {{SQL CARBON EDIT}}
} }
const cells = activeEditorContext.notebookEditor.viewModel.viewCells; const cells = activeEditorContext.notebookEditor.viewModel.viewCells;
@@ -299,13 +299,13 @@ registerAction2(class extends NotebookCellAction<ICellRange> {
getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange): INotebookCellActionContext | undefined { getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange): INotebookCellActionContext | undefined {
if (!context || typeof context.start !== 'number' || typeof context.end !== 'number' || context.start >= context.end) { if (!context || typeof context.start !== 'number' || typeof context.end !== 'number' || context.start >= context.end) {
return undefined; // {{ SQL CARBON EDIT }} return undefined; // {{SQL CARBON EDIT}}
} }
const activeEditorContext = this.getActiveEditorContext(accessor); const activeEditorContext = this.getActiveEditorContext(accessor);
if (!activeEditorContext || !activeEditorContext.notebookEditor.viewModel || context.start >= activeEditorContext.notebookEditor.viewModel.viewCells.length) { if (!activeEditorContext || !activeEditorContext.notebookEditor.viewModel || context.start >= activeEditorContext.notebookEditor.viewModel.viewCells.length) {
return undefined; // {{ SQL CARBON EDIT }} return undefined; // {{SQL CARBON EDIT}}
} }
const cells = activeEditorContext.notebookEditor.viewModel.viewCells; const cells = activeEditorContext.notebookEditor.viewModel.viewCells;

4
src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts
View File

@@ -1107,7 +1107,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
async undo() { async undo() {
if (!this.metadata.editable) { if (!this.metadata.editable) {
return undefined; // {{ SQL CARBON EDIT }} return undefined; // {{SQL CARBON EDIT}}
} }
const editStack = this._undoService.getElements(this.uri); const editStack = this._undoService.getElements(this.uri);
@@ -1127,7 +1127,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
async redo() { async redo() {
if (!this.metadata.editable) { if (!this.metadata.editable) {
return undefined; // {{ SQL CARBON EDIT }} return undefined; // {{SQL CARBON EDIT}}
} }
const editStack = this._undoService.getElements(this.uri); const editStack = this._undoService.getElements(this.uri);

2
src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
View File

@@ -228,7 +228,7 @@ export class SettingsEditor2 extends EditorPane {
private get focusedSettingDOMElement(): HTMLElement | undefined { private get focusedSettingDOMElement(): HTMLElement | undefined {
const focused = this.settingsTree.getFocus()[0]; const focused = this.settingsTree.getFocus()[0];
if (!(focused instanceof SettingsTreeSettingElement)) { if (!(focused instanceof SettingsTreeSettingElement)) {
return undefined; // {{ SQL CARBON EDIT }} return undefined; // {{SQL CARBON EDIT}}
} }
return this.settingRenderers.getDOMElementsForSettingKey(this.settingsTree.getHTMLElement(), focused.setting.key)[0]; return this.settingRenderers.getDOMElementsForSettingKey(this.settingsTree.getHTMLElement(), focused.setting.key)[0];

8
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
View File

@@ -81,7 +81,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import { once } from 'vs/base/common/functional'; import { once } from 'vs/base/common/functional';
import { ThemeIcon } from 'vs/platform/theme/common/themeService'; import { ThemeIcon } from 'vs/platform/theme/common/themeService';
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
// integration with tasks view panel // integration with tasks view panel
import { ITaskService as ISqlTaskService, TaskStatusChangeArgs } from 'sql/workbench/services/tasks/common/tasksService'; import { ITaskService as ISqlTaskService, TaskStatusChangeArgs } from 'sql/workbench/services/tasks/common/tasksService';
import { TaskStatus } from 'sql/workbench/api/common/extHostBackgroundTaskManagement'; import { TaskStatus } from 'sql/workbench/api/common/extHostBackgroundTaskManagement';
@@ -1495,7 +1495,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
const execTask = async (task: Task, resolver: ITaskResolver): Promise<ITaskSummary> => { const execTask = async (task: Task, resolver: ITaskResolver): Promise<ITaskSummary> => {
return ProblemMatcherRegistry.onReady().then(() => { return ProblemMatcherRegistry.onReady().then(() => {
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
const taskNodeId = UUID.generateUuid(); const taskNodeId = UUID.generateUuid();
let taskInfo: TaskInfo = { let taskInfo: TaskInfo = {
databaseName: undefined, databaseName: undefined,
@@ -1512,7 +1512,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
this.lastRunTasksViewTask = taskInfo; this.lastRunTasksViewTask = taskInfo;
let executeResult = this.getTaskSystem().run(task, resolver); let executeResult = this.getTaskSystem().run(task, resolver);
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
return this.handleExecuteResult(executeResult, runSource, taskNodeId); return this.handleExecuteResult(executeResult, runSource, taskNodeId);
}); });
}; };
@@ -1586,7 +1586,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
throw new TaskError(Severity.Warning, nls.localize('TaskSystem.active', 'There is already a task running. Terminate it first before executing another task.'), TaskErrors.RunningTask); throw new TaskError(Severity.Warning, nls.localize('TaskSystem.active', 'There is already a task running. Terminate it first before executing another task.'), TaskErrors.RunningTask);
} }
} }
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
executeResult.promise.then((summary: ITaskSummary) => { executeResult.promise.then((summary: ITaskSummary) => {
let args: TaskStatusChangeArgs = { let args: TaskStatusChangeArgs = {
taskId: taskNodeId ? taskNodeId : executeResult.task._id, taskId: taskNodeId ? taskNodeId : executeResult.task._id,

2
src/vs/workbench/contrib/tasks/electron-browser/taskService.ts
View File

@@ -46,7 +46,7 @@ import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
import { IPathService } from 'vs/workbench/services/path/common/pathService'; import { IPathService } from 'vs/workbench/services/path/common/pathService';
import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences'; import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
// {{ SQL CARBON EDIT }} // {{SQL CARBON EDIT}}
// integration with tasks view panel // integration with tasks view panel
import { ITaskService as ISqlTaskService } from 'sql/workbench/services/tasks/common/tasksService'; import { ITaskService as ISqlTaskService } from 'sql/workbench/services/tasks/common/tasksService';

2
src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts
View File

@@ -23,7 +23,7 @@ const TEST_EDITOR_ID = 'MyTestEditorForEditorsObserver';
const TEST_EDITOR_INPUT_ID = 'testEditorInputForEditorsObserver'; const TEST_EDITOR_INPUT_ID = 'testEditorInputForEditorsObserver';
const TEST_SERIALIZABLE_EDITOR_INPUT_ID = 'testSerializableEditorInputForEditorsObserver'; const TEST_SERIALIZABLE_EDITOR_INPUT_ID = 'testSerializableEditorInputForEditorsObserver';
suite.skip('EditorsObserver', function () { //{{SQL CARBON EDIT}} disable failing tests due to tabcolormode suite.skip('EditorsObserver', function () { // {{SQL CARBON EDIT}} disable failing tests due to tabcolormode
let disposables: IDisposable[] = []; let disposables: IDisposable[] = [];

2
src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
View File

@@ -8,7 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
import { IExtension, IScannedExtension, ExtensionType, ITranslatedScannedExtension, IExtensionManifest } from 'vs/platform/extensions/common/extensions'; import { IExtension, IScannedExtension, ExtensionType, ITranslatedScannedExtension, IExtensionManifest } from 'vs/platform/extensions/common/extensions';
import { IExtensionManagementService, IGalleryExtension, IExtensionIdentifier, ILocalExtension, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement'; import { IExtensionManagementService, IGalleryExtension, IExtensionIdentifier, ILocalExtension, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import { IWorkspace, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; // {{ SQL CARBON EDIT }} import { IWorkspace, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; // {{SQL CARBON EDIT}}
import { ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations'; import { ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
export interface IExtensionManagementServer { export interface IExtensionManagementServer {

4
test/automation/src/application.ts
View File

@@ -66,7 +66,7 @@ export class Application {
async start(expectWalkthroughPart = true): Promise<any> { async start(expectWalkthroughPart = true): Promise<any> {
await this._start(); await this._start();
//{{SQL CARBON EDIT}} // {{SQL CARBON EDIT}}
await this.code.waitForElement('.object-explorer-view'); await this.code.waitForElement('.object-explorer-view');
//Original //Original
@@ -77,7 +77,7 @@ export class Application {
await this.code.waitForActiveElement(`.editor-instance[data-editor-id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`); await this.code.waitForActiveElement(`.editor-instance[data-editor-id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`);
} }
*/ */
//{{SQL CARBON EDIT}} // {{SQL CARBON EDIT}}
} }
async restart(options: { workspaceOrFolder?: string, extraArgs?: string[] }): Promise<any> { async restart(options: { workspaceOrFolder?: string, extraArgs?: string[] }): Promise<any> {

2
test/smoke/src/main.ts
View File

@@ -21,7 +21,7 @@ import {
FileLogger, FileLogger,
} from '../../automation'; } from '../../automation';
import { main as sqlMain, setup as sqlSetup } from './sql/main'; //{{SQL CARBON EDIT}} import { main as sqlMain, setup as sqlSetup } from './sql/main'; // {{SQL CARBON EDIT}}
/*import { setup as setupDataMigrationTests } from './areas/workbench/data-migration.test'; /*import { setup as setupDataMigrationTests } from './areas/workbench/data-migration.test';
import { setup as setupDataLossTests } from './areas/workbench/data-loss.test'; import { setup as setupDataLossTests } from './areas/workbench/data-loss.test';
import { setup as setupDataPreferencesTests } from './areas/preferences/preferences.test'; import { setup as setupDataPreferencesTests } from './areas/preferences/preferences.test';