Rebase against the upstream bf9141b

Eclipse Che Sync · Eclipse Che Sync · commit 79bef8dbf348 · 2023-03-25T08:27:42.000Z
vscode-upstream-sha1: bf9141b
diff --git a/code/package.json b/code/package.json
@@ -101,7 +101,7 @@
   },
   "devDependencies": {
     "7zip": "0.0.6",
-    "@playwright/test": "1.27.1",
+    "@playwright/test": "1.32.1",
     "@swc/cli": "0.1.57",
     "@swc/core": "1.3.32",
     "@types/cookie": "^0.3.3",
diff --git a/code/src/vs/workbench/browser/parts/editor/editorPane.ts b/code/src/vs/workbench/browser/parts/editor/editorPane.ts
@@ -127,7 +127,7 @@ export abstract class EditorPane extends Composite implements IEditorPane {
 	 * in a group.
 	 *
 	 * To monitor the lifecycle of editor inputs, you should not rely on this
-	 * method, rather refer to the listeners on `IEditorGroup` via `IEditorGroupService`.
+	 * method, rather refer to the listeners on `IEditorGroup` via `IEditorGroupsService`.
 	 */
 	clearInput(): void {
 		this._input = undefined;
diff --git a/code/src/vs/workbench/services/editor/common/editorService.ts b/code/src/vs/workbench/services/editor/common/editorService.ts
@@ -226,7 +226,7 @@ export interface IEditorService {
 	 * ```
 	 *
 	 * If you already have an `EditorInput` in hand and must use it for opening, use `group.openEditor`
-	 * instead, via `IEditorGroupService`.
+	 * instead, via `IEditorGroupsService`.
 	 */
 	openEditor(editor: EditorInput, options?: IEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE): Promise<IEditorPane | undefined>;
 
diff --git a/code/yarn.lock b/code/yarn.lock
@@ -638,13 +638,15 @@
     node-addon-api "^3.2.1"
     node-gyp-build "^4.3.0"
 
-"@playwright/test@1.27.1":
-  version "1.27.1"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.27.1.tgz#9364d1e02021261211c8ff586d903faa79ce95c4"
-  integrity sha512-mrL2q0an/7tVqniQQF6RBL2saskjljXzqNcCOVMUjRIgE6Y38nCNaP+Dc2FBW06bcpD3tqIws/HT9qiMHbNU0A==
+"@playwright/test@1.32.1":
+  version "1.32.1"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.32.1.tgz#749c9791adb048c266277a39ba0f7e33fe593ffe"
+  integrity sha512-FTwjCuhlm1qHUGf4hWjfr64UMJD/z0hXYbk+O387Ioe6WdyZQ+0TBDAc6P+pHjx2xCv1VYNgrKbYrNixFWy4Dg==
   dependencies:
     "@types/node" "*"
-    playwright-core "1.27.1"
+    playwright-core "1.32.1"
+  optionalDependencies:
+    fsevents "2.3.2"
 
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
@@ -5007,6 +5009,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
+fsevents@2.3.2, fsevents@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 fsevents@^1.2.7:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
@@ -5020,11 +5027,6 @@ fsevents@~2.3.1:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
   integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
 
-fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
 fstream@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
@@ -8589,16 +8591,16 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-playwright-core@1.27.1:
-  version "1.27.1"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.27.1.tgz#840ef662e55a3ed759d8b5d3d00a5f885a7184f4"
-  integrity sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q==
-
 playwright-core@1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.30.0.tgz#de987cea2e86669e3b85732d230c277771873285"
   integrity sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g==
 
+playwright-core@1.32.1:
+  version "1.32.1"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.32.1.tgz#5a10c32403323b07d75ea428ebeed866a80b76a1"
+  integrity sha512-KZYUQC10mXD2Am1rGlidaalNGYk3LU1vZqqNk0gT4XPty1jOqgup8KDP8l2CUlqoNKhXM5IfGjWgW37xvGllBA==
+
 playwright@^1.29.2:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.30.0.tgz#b1d7be2d45d97fbb59f829f36f521f12010fe072"

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ export abstract class EditorPane extends Composite implements IEditorPane {`
`127`	`127`	`* in a group.`
`128`	`128`	`*`
`129`	`129`	`* To monitor the lifecycle of editor inputs, you should not rely on this`
`130`		- * method, rather refer to the listeners on `IEditorGroup` via `IEditorGroupService`.
	`130`	+ * method, rather refer to the listeners on `IEditorGroup` via `IEditorGroupsService`.
`131`	`131`	`*/`
`132`	`132`	`clearInput(): void {`
`133`	`133`	`this._input = undefined;`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ export interface IEditorService {`
`226`	`226`	* ```
`227`	`227`	`*`
`228`	`228`	* If you already have an `EditorInput` in hand and must use it for opening, use `group.openEditor`
`229`		- * instead, via `IEditorGroupService`.
	`229`	+ * instead, via `IEditorGroupsService`.
`230`	`230`	`*/`
`231`	`231`	`openEditor(editor: EditorInput, options?: IEditorOptions, group?: IEditorGroup \| GroupIdentifier \| SIDE_GROUP_TYPE \| ACTIVE_GROUP_TYPE): Promise<IEditorPane \| undefined>;`
`232`	`232`