sessions: change workbench state to worksapce and do not send workspace data to ext host (#298301)

Author: sandy081

src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts

@@ -371,6 +371,7 @@ suite('Snippet Variables Resolver', function () {
 			getCompleteWorkspace = this._throw;
 			getWorkspace(): IWorkspace { return workspace; }
 			getWorkbenchState = this._throw;
+			hasWorkspaceData = this._throw;
 			getWorkspaceFolder = this._throw;
 			isCurrentWorkspace = this._throw;
 			isInsideWorkspace = this._throw;

src/vs/editor/standalone/browser/standaloneServices.ts

@@ -852,6 +852,10 @@ class StandaloneWorkspaceContextService implements IWorkspaceContextService {
 		return WorkbenchState.EMPTY;
 	}
 
+	public hasWorkspaceData(): boolean {
+		return this.getWorkbenchState() !== WorkbenchState.EMPTY;
+	}
+
 	public getWorkspaceFolder(resource: URI): IWorkspaceFolder | null {
 		return resource && resource.scheme === StandaloneWorkspaceContextService.SCHEME ? this.workspace.folders[0] : null;
 	}

src/vs/platform/workspace/common/workspace.ts

@@ -74,6 +74,11 @@ export interface IWorkspaceContextService {
 	 * Returns if the provided resource is inside the workspace or not.
 	 */
 	isInsideWorkspace(resource: URI): boolean;
+
+	/**
+	 * Return `true` if the current workspace has data (e.g. folders or a workspace configuration) that can be sent to the extension host, otherwise `false`.
+	 */
+	hasWorkspaceData(): boolean;
 }
 
 export interface IResolvedWorkspace extends IWorkspaceIdentifier, IBaseWorkspace {

src/vs/sessions/services/workspace/browser/workspaceContextService.ts

@@ -49,7 +49,11 @@ export class SessionsWorkspaceContextService extends Disposable implements IWork
 	}
 
 	getWorkbenchState(): WorkbenchState {
-		return WorkbenchState.EMPTY;
+		return WorkbenchState.WORKSPACE;
+	}
+
+	hasWorkspaceData(): boolean {
+		return false;
 	}
 
 	getWorkspaceFolder(resource: URI): IWorkspaceFolder | null {

src/vs/workbench/api/browser/mainThreadWorkspace.ts

@@ -16,7 +16,7 @@ import { ILabelService } from '../../../platform/label/common/label.js';
 import { INotificationService } from '../../../platform/notification/common/notification.js';
 import { AuthInfo, Credentials, IRequestService } from '../../../platform/request/common/request.js';
 import { WorkspaceTrustRequestOptions, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, ResourceTrustRequestOptions } from '../../../platform/workspace/common/workspaceTrust.js';
-import { IWorkspace, IWorkspaceContextService, WorkbenchState, isUntitledWorkspace, WorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
+import { IWorkspace, IWorkspaceContextService, isUntitledWorkspace, WorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import { checkGlobFileExists } from '../../services/extensions/common/workspaceContains.js';
 import { IFileQueryBuilderOptions, ITextQueryBuilderOptions, QueryBuilder } from '../../services/search/common/queryBuilder.js';
@@ -130,7 +130,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 	}
 
 	private getWorkspaceData(workspace: IWorkspace): IWorkspaceData | null {
-		if (this._contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+		if (!this._contextService.hasWorkspaceData()) {
 			return null;
 		}
 		return {

src/vs/workbench/services/configuration/browser/configurationService.ts

@@ -194,6 +194,10 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 		return WorkbenchState.EMPTY;
 	}
 
+	public hasWorkspaceData(): boolean {
+		return this.getWorkbenchState() !== WorkbenchState.EMPTY;
+	}
+
 	public getWorkspaceFolder(resource: URI): IWorkspaceFolder | null {
 		return this.workspace.getFolder(resource);
 	}

src/vs/workbench/test/common/workbenchTestServices.ts

@@ -120,6 +120,10 @@ export class TestContextService implements IWorkspaceContextService {
 		return WorkbenchState.EMPTY;
 	}
 
+	hasWorkspaceData(): boolean {
+		return this.getWorkbenchState() !== WorkbenchState.EMPTY;
+	}
+
 	getCompleteWorkspace(): Promise<IWorkspace> {
 		return Promise.resolve(this.getWorkspace());
 	}