diff --git a/build/hygiene.js b/build/hygiene.js index a08386c83f..692627b192 100644 --- a/build/hygiene.js +++ b/build/hygiene.js @@ -30,7 +30,7 @@ const all = [ 'test/**/*', '!test/**/out/**', '!**/node_modules/**', - '!build/actions/**/*.js', // {{ SQL CARBON EDIT }} + '!build/actions/**/*.js', // {{SQL CARBON EDIT}} '!build/**/*' // {{SQL CARBON EDIT}} ]; module.exports.all = all; diff --git a/extensions/markdown-language-features/src/commands/openDocumentLink.ts b/extensions/markdown-language-features/src/commands/openDocumentLink.ts index 2f10cbc2ba..6551b09bc4 100644 --- a/extensions/markdown-language-features/src/commands/openDocumentLink.ts +++ b/extensions/markdown-language-features/src/commands/openDocumentLink.ts @@ -10,7 +10,7 @@ import { Command } from '../commandManager'; import { MarkdownEngine } from '../markdownEngine'; import { TableOfContentsProvider } from '../tableOfContentsProvider'; import { isMarkdownFile } from '../util/file'; -import { isString } from 'util'; // {{ SQL CARBON EDIT }} +import { isString } from 'util'; // {{SQL CARBON EDIT}} type UriComponents = { @@ -154,7 +154,7 @@ export class OpenDocumentLinkCommand implements Command { } 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.parse('').with(parts); diff --git a/extensions/notebook/yarn.lock b/extensions/notebook/yarn.lock index 3afe7470c8..a9d4c16612 100644 --- a/extensions/notebook/yarn.lock +++ b/extensions/notebook/yarn.lock @@ -1756,7 +1756,7 @@ uri-js@^4.2.2: dependencies: 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" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b" integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q== diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts index 1b6f0353c9..26342b9bbe 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts @@ -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); } diff --git a/src/vs/base/parts/tree/browser/treeImpl.ts b/src/vs/base/parts/tree/browser/treeImpl.ts index 3f6f80a582..6adfc8774e 100644 --- a/src/vs/base/parts/tree/browser/treeImpl.ts +++ b/src/vs/base/parts/tree/browser/treeImpl.ts @@ -189,7 +189,7 @@ export class Tree implements _.ITree { 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[] { return this.model.getExpandedElements(); } @@ -205,7 +205,7 @@ export class Tree implements _.ITree { getContentHeight(): number { return this.view.getContentHeight(); } - // {{SQL CARBON EDIT }} - end block + // {{SQL CARBON EDIT}} - end block public getHighlight(): any { diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts index 8e632c50c7..11b8ef5bce 100644 --- a/src/vs/base/test/browser/dom.test.ts +++ b/src/vs/base/test/browser/dom.test.ts @@ -8,7 +8,7 @@ import * as dom from 'vs/base/browser/dom'; const $ = dom.$; suite('dom', () => { - test.skip('hasClass', () => { //{{SQL CARBON EDIT}} skip test + test.skip('hasClass', () => { // {{SQL CARBON EDIT}} skip test let element = document.createElement('div'); element.className = 'foobar boo far'; @@ -21,7 +21,7 @@ suite('dom', () => { 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'); element.className = 'foobar boo far'; @@ -54,7 +54,7 @@ suite('dom', () => { 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'); element.classList.add('foo-bar'); diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts index 988dd9f73b..1a53373ece 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts @@ -90,7 +90,7 @@ interface ISharedProcessInitData { backupWorkspacesPath: string; } -const eventPrefix = 'adsworkbench'; // {{ SQL CARBON EDIT }} +const eventPrefix = 'adsworkbench'; // {{SQL CARBON EDIT}} class MainProcessService implements IMainProcessService { diff --git a/src/vs/code/electron-browser/workbench/workbench.js b/src/vs/code/electron-browser/workbench/workbench.js index dda8ab1856..866e57d2ad 100644 --- a/src/vs/code/electron-browser/workbench/workbench.js +++ b/src/vs/code/electron-browser/workbench/workbench.js @@ -20,7 +20,7 @@ // we know for a fact that workbench.desktop.main will depend on // the related CSS and NLS counterparts. bootstrapWindow.load([ - 'sql/setup', // {{ SQL CARBON EDIT }} + 'sql/setup', // {{SQL CARBON EDIT}} 'vs/workbench/workbench.desktop.main', 'vs/nls!vs/workbench/workbench.desktop.main', 'vs/css!vs/workbench/workbench.desktop.main' diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts index c9274358c8..9bb0b86a5b 100644 --- a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts +++ b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts @@ -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)}`; } diff --git a/src/vs/code/electron-sandbox/issue/test/testReporterModel.test.ts b/src/vs/code/electron-sandbox/issue/test/testReporterModel.test.ts index 172370f62d..c00cb35c47 100644 --- a/src/vs/code/electron-sandbox/issue/test/testReporterModel.test.ts +++ b/src/vs/code/electron-sandbox/issue/test/testReporterModel.test.ts @@ -80,7 +80,7 @@ OS version: undefined `); }); - 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({ issueType: 0, systemInfo: { @@ -129,7 +129,7 @@ OS version: undefined `); }); - 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({ issueType: 0, systemInfo: { diff --git a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts index 50eb5cb662..2b0e577ed6 100644 --- a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts +++ b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts @@ -819,7 +819,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () { provideCompletionItems(doc, pos) { countB += 1; if (!doc.getWordUntilPosition(pos).word.startsWith('a')) { - // {{ SQL CARBON EDIT }} strict null checks + // {{SQL CARBON EDIT}} strict null checks return undefined; } return { diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts index 524a26d06f..b1d24b50de 100644 --- a/src/vs/platform/contextkey/common/contextkey.ts +++ b/src/vs/platform/contextkey/common/contextkey.ts @@ -59,7 +59,7 @@ export interface IContextKeyExpression { export type ContextKeyExpression = ( ContextKeyFalseExpr | ContextKeyTrueExpr | ContextKeyDefinedExpr | ContextKeyNotExpr | 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 { diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts index 3565493e64..8fd2064066 100644 --- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts @@ -572,7 +572,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService { 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; } diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 09e2dff405..2ac79a863a 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -161,7 +161,7 @@ export class ExtensionManagementService extends Disposable implements IExtension const manifest = await getManifest(zipPath); const identifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) }; // let operation: InstallOperation = InstallOperation.Install; {{ SQL CARBON EDIT }} - // {{ SQL CARBON EDIT }} + // {{SQL CARBON EDIT}} 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)); } @@ -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); } ); - // {{ SQL CARBON EDIT }} + // {{SQL CARBON EDIT}} // let metadata: IGalleryMetadata | undefined; // try { // metadata = await this.getGalleryMetadata(getGalleryExtensionId(manifest.publisher, manifest.name)); @@ -242,7 +242,7 @@ export class ExtensionManagementService extends Disposable implements IExtension return downloadedLocation; } - // {{ SQL CARBON EDIT }} + // {{SQL CARBON EDIT}} /*private async installFromZipPath(identifierWithVersion: ExtensionIdentifierWithVersion, zipPath: string, metadata: IMetadata | undefined, operation: InstallOperation, token: CancellationToken): Promise { try { const local = await this.installExtension({ zipPath, identifierWithVersion, metadata }, token); @@ -521,7 +521,7 @@ export class ExtensionManagementService extends Disposable implements IExtension return local; } - // {{ SQL CARBON EDIT }} + // {{SQL CARBON EDIT}} /*private async getGalleryMetadata(extensionName: string): Promise { const galleryExtension = await this.findGalleryExtensionByName(extensionName); return galleryExtension ? { id: galleryExtension.identifier.uuid, publisherDisplayName: galleryExtension.publisherDisplayName, publisherId: galleryExtension.publisherId } : undefined; diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts index bbf2a1b953..35a0f3b691 100644 --- a/src/vs/platform/extensions/common/extensions.ts +++ b/src/vs/platform/extensions/common/extensions.ts @@ -181,7 +181,7 @@ export interface IExtensionManifest { readonly publisher: string; readonly version: string; 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 main?: string; readonly browser?: string; @@ -278,7 +278,7 @@ export interface IExtensionDescription extends IExtensionManifest { readonly isUnderDevelopment: boolean; readonly extensionLocation: URI; enableProposedApi?: boolean; - readonly forceReload?: boolean; // {{ SQL CARBON EDIT }} + readonly forceReload?: boolean; // {{SQL CARBON EDIT}} } export function isLanguagePackExtension(manifest: IExtensionManifest): boolean { diff --git a/src/vs/workbench/api/browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/browser/mainThreadQuickOpen.ts index eac27e8a7b..8acfa77e0e 100644 --- a/src/vs/workbench/api/browser/mainThreadQuickOpen.ts +++ b/src/vs/workbench/api/browser/mainThreadQuickOpen.ts @@ -37,14 +37,14 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape { } $show(instance: number, options: IPickOptions, token: CancellationToken): Promise { - // {{ 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 focusBackToStartingPosition = () => { try { activeElement?.focus(); } 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((resolve, reject) => { this._items[instance] = { resolve, reject }; @@ -61,7 +61,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape { if (options.canPickMany) { 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) { return items.map(item => item.handle); } @@ -69,7 +69,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape { }); } else { 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) { return item.handle; } diff --git a/src/vs/workbench/api/browser/mainThreadTreeViews.ts b/src/vs/workbench/api/browser/mainThreadTreeViews.ts index 9dcf44b3bc..8f22e1d759 100644 --- a/src/vs/workbench/api/browser/mainThreadTreeViews.ts +++ b/src/vs/workbench/api/browser/mainThreadTreeViews.ts @@ -228,7 +228,7 @@ export class TreeViewDataProvider implements ITreeViewDataProvider { } protected async postGetChildren(elements: ITreeItem[]): Promise { // {{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; if (elements) { for (const element of elements) { diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts index 892388c47d..77e0a7ea4a 100644 --- a/src/vs/workbench/api/common/extHostApiCommands.ts +++ b/src/vs/workbench/api/common/extHostApiCommands.ts @@ -305,7 +305,7 @@ const newCommands: ApiCommand[] = [ ApiCommandArgument.Uri, new ApiCommandArgument('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 ? 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 => (!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(), 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'), new ApiCommandArgument('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 ? 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 => (!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() ], ApiCommandResult.Void diff --git a/src/vs/workbench/api/common/extHostRequireInterceptor.ts b/src/vs/workbench/api/common/extHostRequireInterceptor.ts index 2131aa8ea6..6abd4b7d0b 100644 --- a/src/vs/workbench/api/common/extHostRequireInterceptor.ts +++ b/src/vs/workbench/api/common/extHostRequireInterceptor.ts @@ -27,7 +27,7 @@ interface LoadFunction { (request: string): any; } -export interface INodeModuleFactory { //{{SQL CARBON EDIT}} export interface +export interface INodeModuleFactory { // {{SQL CARBON EDIT}} export interface readonly nodeModuleName: string | string[]; load(request: string, parent: URI, original: LoadFunction): any; alternativeModuleName?(name: string): string | undefined; diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts index 50954a459d..5b9faa25cf 100644 --- a/src/vs/workbench/api/common/extHostTerminalService.ts +++ b/src/vs/workbench/api/common/extHostTerminalService.ts @@ -292,7 +292,7 @@ export class ExtHostPseudoterminal implements ITerminalChildProcess { }); } 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); diff --git a/src/vs/workbench/api/common/extHostTreeViews.ts b/src/vs/workbench/api/common/extHostTreeViews.ts index e502a835b7..71d9684c44 100644 --- a/src/vs/workbench/api/common/extHostTreeViews.ts +++ b/src/vs/workbench/api/common/extHostTreeViews.ts @@ -588,7 +588,7 @@ export class ExtHostTreeView extends Disposable { const disposable = new DisposableStore(); const handle = this.createHandle(element, extensionTreeItem, parent); const icon = this.getLightIconPath(extensionTreeItem); - // {{ SQL CARBON EDIT }} + // {{SQL CARBON EDIT}} const item = { handle, parentHandle: parent ? parent.item.handle : undefined, diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts index 259375f2e9..7302e9d7a6 100644 --- a/src/vs/workbench/api/node/extHostTask.ts +++ b/src/vs/workbench/api/node/extHostTask.ts @@ -161,7 +161,7 @@ export class ExtHostTask extends ExtHostTaskBase { paths ); } - return result;*/ // {{ SQL CARBON EDIT }} + return result;*/ // {{SQL CARBON EDIT}} return undefined; } diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index b19491d348..1975a5335b 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -44,7 +44,7 @@ import { Action2, registerAction2 } from 'vs/platform/actions/common/actions'; import { CATEGORIES } from 'vs/workbench/common/actions'; 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 { readonly id: string; diff --git a/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts b/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts index fe372f10be..ef16b35fca 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts @@ -23,7 +23,7 @@ import { ConfigBasedRecommendations } from 'vs/workbench/contrib/extensions/brow import { StaticRecommendations } from 'sql/workbench/contrib/extensions/browser/staticRecommendations'; import { ScenarioRecommendations } from 'sql/workbench/contrib/extensions/browser/scenarioRecommendations'; 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 = { recommendationReason: { classification: 'SystemMetaData', purpose: 'FeatureInsight', isMeasurement: true }; diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts index a2f7f8d10a..be207a500d 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts @@ -24,7 +24,7 @@ import { /*RecentlyPublishedExtensionsAction, */ShowInstalledExtensionsAction, ShowOutdatedExtensionsAction, ShowDisabledExtensionsAction, ShowEnabledExtensionsAction, PredefinedExtensionFilterAction, RefreshExtensionsAction } 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 { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput'; diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts index d50710ba89..7d5ef731f5 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts @@ -31,14 +31,14 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer'; 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 { alert } from 'vs/base/browser/ui/aria/aria'; import { IListContextMenuEvent } from 'vs/base/browser/ui/list/list'; import { createErrorWithActions } from 'vs/base/common/errorsWithActions'; import { CancellationToken } from 'vs/base/common/cancellation'; 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 { IProductService } from 'vs/platform/product/common/productService'; import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon'; diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts b/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts index 8ac16a6eb0..4be68a48de 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts @@ -244,13 +244,13 @@ registerAction2(class extends NotebookCellAction { getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange): INotebookCellActionContext | undefined { 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); 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; @@ -299,13 +299,13 @@ registerAction2(class extends NotebookCellAction { getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange): INotebookCellActionContext | undefined { 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); 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; diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts index 370f6b1a8b..2f4e8e8134 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts @@ -1107,7 +1107,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD async undo() { if (!this.metadata.editable) { - return undefined; // {{ SQL CARBON EDIT }} + return undefined; // {{SQL CARBON EDIT}} } const editStack = this._undoService.getElements(this.uri); @@ -1127,7 +1127,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD async redo() { if (!this.metadata.editable) { - return undefined; // {{ SQL CARBON EDIT }} + return undefined; // {{SQL CARBON EDIT}} } const editStack = this._undoService.getElements(this.uri); diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts index 118b3992d7..94d0f40de5 100644 --- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts +++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts @@ -228,7 +228,7 @@ export class SettingsEditor2 extends EditorPane { private get focusedSettingDOMElement(): HTMLElement | undefined { const focused = this.settingsTree.getFocus()[0]; 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]; diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts index f83852b78d..e9e7206a6b 100644 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts @@ -81,7 +81,7 @@ import { ILogService } from 'vs/platform/log/common/log'; import { once } from 'vs/base/common/functional'; import { ThemeIcon } from 'vs/platform/theme/common/themeService'; -// {{ SQL CARBON EDIT }} +// {{SQL CARBON EDIT}} // integration with tasks view panel import { ITaskService as ISqlTaskService, TaskStatusChangeArgs } from 'sql/workbench/services/tasks/common/tasksService'; 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 => { return ProblemMatcherRegistry.onReady().then(() => { - // {{ SQL CARBON EDIT }} + // {{SQL CARBON EDIT}} const taskNodeId = UUID.generateUuid(); let taskInfo: TaskInfo = { databaseName: undefined, @@ -1512,7 +1512,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer this.lastRunTasksViewTask = taskInfo; let executeResult = this.getTaskSystem().run(task, resolver); - // {{ SQL CARBON EDIT }} + // {{SQL CARBON EDIT}} 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); } } - // {{ SQL CARBON EDIT }} + // {{SQL CARBON EDIT}} executeResult.promise.then((summary: ITaskSummary) => { let args: TaskStatusChangeArgs = { taskId: taskNodeId ? taskNodeId : executeResult.task._id, diff --git a/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts b/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts index f34709073f..21b97635d8 100644 --- a/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts +++ b/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts @@ -46,7 +46,7 @@ import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { IPathService } from 'vs/workbench/services/path/common/pathService'; import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; -// {{ SQL CARBON EDIT }} +// {{SQL CARBON EDIT}} // integration with tasks view panel import { ITaskService as ISqlTaskService } from 'sql/workbench/services/tasks/common/tasksService'; diff --git a/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts b/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts index 5b1aecd542..9450c2af5b 100644 --- a/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts +++ b/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts @@ -23,7 +23,7 @@ const TEST_EDITOR_ID = 'MyTestEditorForEditorsObserver'; const TEST_EDITOR_INPUT_ID = 'testEditorInputForEditorsObserver'; 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[] = []; diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts index 10999903b1..1124c81431 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts @@ -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 { IExtensionManagementService, IGalleryExtension, IExtensionIdentifier, ILocalExtension, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement'; 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'; export interface IExtensionManagementServer { diff --git a/test/automation/src/application.ts b/test/automation/src/application.ts index 08c80be132..45248c243f 100644 --- a/test/automation/src/application.ts +++ b/test/automation/src/application.ts @@ -66,7 +66,7 @@ export class Application { async start(expectWalkthroughPart = true): Promise { await this._start(); - //{{SQL CARBON EDIT}} + // {{SQL CARBON EDIT}} await this.code.waitForElement('.object-explorer-view'); //Original @@ -77,7 +77,7 @@ export class Application { 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 { diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts index 17517ed17e..d838d860ee 100644 --- a/test/smoke/src/main.ts +++ b/test/smoke/src/main.ts @@ -21,7 +21,7 @@ import { FileLogger, } 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 setupDataLossTests } from './areas/workbench/data-loss.test'; import { setup as setupDataPreferencesTests } from './areas/preferences/preferences.test';