chore: migrate config settings to workspaceState

microsoft · May 16, 2024 · 4d87027 · 4d87027
1 parent ed284ee
commit 4d87027
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -99,7 +99,7 @@ export class Extension implements RunHooks {
       },
     });
 
-    this._settingsModel = new SettingsModel(vscode);
+    this._settingsModel = new SettingsModel(vscode, context);
     this._models = new TestModelCollection(vscode, context);
     this._reusedBrowser = new ReusedBrowser(this._vscode, this._settingsModel, this._envProvider.bind(this));
     this._traceViewer = new TraceViewer(this._vscode, this._settingsModel, this._envProvider.bind(this));

diff --git a/src/settingsModel.ts b/src/settingsModel.ts
@@ -33,17 +33,21 @@ export type WorkspaceSettings = {
   configs?: ConfigSettings[];
 };
 
+export const workspaceStateKey = 'pw.workspace-settings';
+
 export class SettingsModel extends DisposableBase {
   private _vscode: vscodeTypes.VSCode;
   private _settings = new Map<string, Setting<any>>();
+  private _context: vscodeTypes.ExtensionContext;
   readonly onChange: vscodeTypes.Event<void>;
   private _onChange: vscodeTypes.EventEmitter<void>;
   showBrowser: Setting<boolean>;
   showTrace: Setting<boolean>;
 
-  constructor(vscode: vscodeTypes.VSCode) {
+  constructor(vscode: vscodeTypes.VSCode, context: vscodeTypes.ExtensionContext) {
     super();
     this._vscode = vscode;
+    this._context = context;
     this._onChange = new vscode.EventEmitter();
     this.onChange = this._onChange.event;
 
@@ -58,6 +62,16 @@ export class SettingsModel extends DisposableBase {
       if (enabled && this.showBrowser.get())
         this.showBrowser.set(false);
     });
+
+    this._modernize();
+  }
+
+  private _modernize() {
+    const workspaceSettings = this._vscode.workspace.getConfiguration('playwright').get('workspaceSettings') as any;
+    if (workspaceSettings?.configs && !this._context.workspaceState.get(workspaceStateKey)) {
+      this._context.workspaceState.update(workspaceStateKey, { configs: workspaceSettings.configs });
+      this._vscode.workspace.getConfiguration('playwright').update('workspaceSettings', undefined);
+    }
   }
 
   private _createSetting<T>(settingName: string): Setting<T> {

diff --git a/src/testModel.ts b/src/testModel.ts
@@ -20,6 +20,7 @@ import { resolveSourceMap } from './utils';
 import { ConfigListFilesReport, ProjectConfigWithFiles } from './listTests';
 import * as reporterTypes from './upstream/reporter';
 import { TeleSuite } from './upstream/teleReceiver';
+import { workspaceStateKey } from './settingsModel';
 import type { SettingsModel, WorkspaceSettings } from './settingsModel';
 import path from 'path';
 import { DisposableBase } from './disposableBase';
@@ -744,8 +745,6 @@ export function projectFiles(project: TestProject): Map<string, reporterTypes.Su
   return files;
 }
 
-const workspaceStateKey = 'pw.workspace-settings';
-
 const listFilesFlag = Symbol('listFilesFlag');
 
 function isAncestorOf(root: vscodeTypes.TestItem, descendent: vscodeTypes.TestItem) {