ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-20 01:25:37 -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

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