ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-26 06:40:30 -04: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

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> {
// {{ 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<TransferQuickPickItems[]>((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;
}

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
const result: ITreeItem[] = []; //{{SQL CARBON EDIT}}
const result: ITreeItem[] = []; // {{SQL CARBON EDIT}}
const hasResolve = await this.hasResolve;
if (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,
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 => <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(),
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<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 => <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()
],
ApiCommandResult.Void

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

@@ -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;

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

@@ -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);

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

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

@@ -161,7 +161,7 @@ export class ExtHostTask extends ExtHostTaskBase {
paths
);
}
return result;*/ // {{ SQL CARBON EDIT }}
return result;*/ // {{SQL CARBON EDIT}}
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 { 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;

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 { 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 };

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

@@ -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';

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 { 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';

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 {
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<ICellRange> {
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;

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() {
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);

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 {
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];

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 { 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<ITaskSummary> => {
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,

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 { 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';

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_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[] = [];

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