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

Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

Browse Source
This commit is contained in:
Cory Rivera
2021-08-25 16:28:29 -07:00
committed by GitHub
parent ab1112bfb3
commit cb7b7da0a4
1752 changed files with 59525 additions and 33878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/workbench/contrib/resourceViewer/browser/resourceViewerEditor.ts
View File

@@ -10,7 +10,7 @@ import { DisposableStore } from 'vs/base/common/lifecycle';
import { CancellationToken } from 'vs/base/common/cancellation';
import { IStorageService } from 'vs/platform/storage/common/storage';
import * as DOM from 'vs/base/browser/dom';
import { EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
import { IEditorOpenContext } from 'vs/workbench/common/editor';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -23,6 +23,7 @@ import { fillInActions } from 'vs/platform/actions/browser/menuEntryActionViewIt
import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { IEditorOptions } from 'vs/platform/editor/common/editor';
export type ContextMenuAnchor = HTMLElement | { x: number; y: number; width?: number; height?: number; };
@@ -88,7 +89,7 @@ export class ResourceViewerEditor extends EditorPane {
return this._input as ResourceViewerInput;
}
override async setInput(input: ResourceViewerInput, options: EditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
override async setInput(input: ResourceViewerInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
await super.setInput(input, options, context, token);
this._resourceViewerTable.title = input.title;
@@ -105,9 +106,9 @@ export class ResourceViewerEditor extends EditorPane {
});
this._inputDisposables.add(input.onColumnsChanged(columns => {
this._resourceViewerTable.columns = columns;
this._resourceViewerTable.columns = columns as any; // Cast to any to fix strict type assertion error
}));
this._resourceViewerTable.columns = input.columns;
this._resourceViewerTable.columns = input.columns as any;
this._inputDisposables.add(input.onDataChanged(() => {
this._resourceViewerTable.data = input.data;

4
src/sql/workbench/contrib/resourceViewer/browser/resourceViewerTable.ts
View File

@@ -95,7 +95,7 @@ export class ResourceViewerTable extends Disposable {
}
public set columns(columns: Slick.Column<Slick.SlickData>[]) {
this._resourceViewerTable.columns = columns;
this._resourceViewerTable.columns = columns as any; // Cast to any to fix strict type assertion error
this._resourceViewerTable.autosizeColumns();
}
@@ -128,7 +128,7 @@ export class ResourceViewerTable extends Disposable {
const columns = this._resourceViewerTable.grid.getColumns();
let value = true;
for (let i = 0; i < columns.length; i++) {
const col: FilterableColumn<Slick.SlickData> = columns[i];
const col: FilterableColumn<Slick.SlickData> = columns[i] as any; // Cast to any to fix strict type assertion error
if (!col.field) {
continue;
}