ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-14 03:58:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

Browse Source
This commit is contained in:
Karl Burtram
2019-04-05 10:09:18 -07:00
committed by GitHub
parent 9bd7e30d18
commit cb5bcf2248
433 changed files with 8915 additions and 8361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/electron-browser/window.ts
View File

@@ -115,7 +115,7 @@ export class ElectronWindow extends Disposable {
// Support runAction event
ipc.on('vscode:runAction', (event: Event, request: IRunActionInWindowRequest) => {
const args: any[] = request.args || [];
const args: unknown[] = request.args || [];
// If we run an action from the touchbar, we fill in the currently active resource
// as payload because the touch bar items are context aware depending on the editor
@@ -504,7 +504,7 @@ export class ElectronWindow extends Disposable {
}
private openResources(resources: Array<IResourceInput | IUntitledResourceInput>, diffMode: boolean): void {
this.lifecycleService.when(LifecyclePhase.Ready).then((): Promise<any> => {
this.lifecycleService.when(LifecyclePhase.Ready).then((): Promise<unknown> => {
// In diffMode we open 2 resources as diff
if (diffMode && resources.length === 2) {
@@ -526,9 +526,9 @@ export class ElectronWindow extends Disposable {
const resource = URI.revive(p.fileUri);
let input: IResourceInput | IUntitledResourceInput;
if (isNew) {
input = { filePath: resource.fsPath, options: { pinned: true } } as IUntitledResourceInput;
input = { filePath: resource.fsPath, options: { pinned: true } };
} else {
input = { resource, options: { pinned: true } } as IResourceInput;
input = { resource, options: { pinned: true } };
}
if (!isNew && typeof p.lineNumber === 'number' && typeof p.columnNumber === 'number') {