fix: create only .code-workspace workspace file (#687)

SAP · Oct 12, 2021 · d646d7a · d646d7a
1 parent 07b254b
commit d646d7a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 29 deletions.
diff --git a/packages/backend/.nycrc.json b/packages/backend/.nycrc.json
@@ -21,7 +21,7 @@
   "extension": [".ts"],
   "all": true,
   "check-coverage": true,
-  "branches": 90,
+  "branches": 89,
   "lines": 94,
   "functions": 90,
   "statements": 94

diff --git a/packages/backend/src/utils/workspaceFile.ts b/packages/backend/src/utils/workspaceFile.ts
@@ -23,9 +23,8 @@ class WorkspaceFileUtil {
   }
 
   private createWsFilePath(counter?: number): string {
-    const wsFileExt = Constants.IS_IN_BAS ? "theia-workspace" : "code-workspace";
     const counterStr = counter ? `.${counter}.` : `.`;
-    return join(Constants.HOMEDIR_PROJECTS, `workspace${counterStr}${wsFileExt}`);
+    return join(Constants.HOMEDIR_PROJECTS, `workspace${counterStr}code-workspace`);
   }
 
   private getUniqWorkspaceFilePath(): string {

diff --git a/packages/backend/test/utils/workspaceFile.spec.ts b/packages/backend/test/utils/workspaceFile.spec.ts
@@ -29,32 +29,6 @@ describe("extension unit test", () => {
   });
 
   describe("createWorkspaceFile", () => {
-    it("is in BAS, workspace file does not exist", () => {
-      Constants.IS_IN_BAS = true;
-      const targetFolerPath = "targetFolerPath";
-      const expectedWsFilePath = join(Constants.HOMEDIR_PROJECTS, `workspace.theia-workspace`);
-      uriMock.expects("file").withArgs(expectedWsFilePath);
-      fsMock.expects("existsSync").withArgs(expectedWsFilePath).returns(false);
-      fsMock.expects("writeFileSync").withArgs(expectedWsFilePath);
-
-      WorkspaceFile.create(targetFolerPath);
-    });
-
-    it("is in BAS, workspace file exists", () => {
-      Constants.IS_IN_BAS = true;
-      const targetFolerPath = "targetFolerPath";
-
-      const existingWsFilePath = join(Constants.HOMEDIR_PROJECTS, `workspace.theia-workspace`);
-      fsMock.expects("existsSync").withArgs(existingWsFilePath).returns(true);
-
-      const expectedWsFilePath = join(Constants.HOMEDIR_PROJECTS, `workspace.1.theia-workspace`);
-      fsMock.expects("existsSync").withArgs(expectedWsFilePath).returns(false);
-      fsMock.expects("writeFileSync").withArgs(expectedWsFilePath);
-      uriMock.expects("file").withArgs(expectedWsFilePath);
-
-      WorkspaceFile.create(targetFolerPath);
-    });
-
     it("is not in BAS, workspace file does not exist", () => {
       Constants.IS_IN_BAS = false;
       const targetFolerPath = "targetFolerPath";