mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-05 09:35:39 -05:00
Merge from vscode cfc1ab4c5f816765b91fb7ead3c3427a7c8581a3
This commit is contained in:
@@ -93,7 +93,7 @@ export function reviveWorkspaceIdentifier(workspace: { id: string, configPath: U
|
||||
return { id: workspace.id, configPath: URI.revive(workspace.configPath) };
|
||||
}
|
||||
|
||||
export function isStoredWorkspaceFolder(thing: any): thing is IStoredWorkspaceFolder {
|
||||
export function isStoredWorkspaceFolder(thing: unknown): thing is IStoredWorkspaceFolder {
|
||||
return isRawFileWorkspaceFolder(thing) || isRawUriWorkspaceFolder(thing);
|
||||
}
|
||||
|
||||
@@ -148,11 +148,11 @@ export interface IEnterWorkspaceResult {
|
||||
backupPath?: string;
|
||||
}
|
||||
|
||||
export function isSingleFolderWorkspaceIdentifier(obj: any): obj is ISingleFolderWorkspaceIdentifier {
|
||||
export function isSingleFolderWorkspaceIdentifier(obj: unknown): obj is ISingleFolderWorkspaceIdentifier {
|
||||
return obj instanceof URI;
|
||||
}
|
||||
|
||||
export function isWorkspaceIdentifier(obj: any): obj is IWorkspaceIdentifier {
|
||||
export function isWorkspaceIdentifier(obj: unknown): obj is IWorkspaceIdentifier {
|
||||
const workspaceIdentifier = obj as IWorkspaceIdentifier;
|
||||
|
||||
return workspaceIdentifier && typeof workspaceIdentifier.id === 'string' && workspaceIdentifier.configPath instanceof URI;
|
||||
|
||||
@@ -10,7 +10,7 @@ import { IWorkspacesMainService } from 'vs/platform/workspaces/electron-main/wor
|
||||
import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
|
||||
import { IWorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
|
||||
|
||||
export class WorkspacesService implements AddFirstParameterToFunctions<IWorkspacesService, Promise<any> /* only methods, not events */, number /* window ID */> {
|
||||
export class WorkspacesService implements AddFirstParameterToFunctions<IWorkspacesService, Promise<unknown> /* only methods, not events */, number /* window ID */> {
|
||||
|
||||
_serviceBrand: undefined;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user