fix: do not write jsconfig.json on core when there is tsconfig.json (#…

…586)

* fix: do not write jsconfig.json on core when there is tsconfig.json

* fix: empty commit to refresh PR for CLA

packages/lightning-lsp-common/src/__tests__/context.test.ts

@@ -281,20 +281,27 @@ it('configureCoreMulti()', async () => {
     const jsconfigPathGlobal = context.workspaceRoots[1] + '/modules/jsconfig.json';
     const codeWorkspacePath = CORE_ALL_ROOT + '/core.code-workspace';
     const launchPath = CORE_ALL_ROOT + '/.vscode/launch.json';
+    const tsconfigPathForce = context.workspaceRoots[0] + '/tsconfig.json';
 
     // make sure no generated files are there from previous runs
     fs.removeSync(jsconfigPathGlobal);
     fs.removeSync(jsconfigPathForce);
     fs.removeSync(codeWorkspacePath);
     fs.removeSync(launchPath);
+    fs.removeSync(tsconfigPathForce);
+
+    fs.createFileSync(tsconfigPathForce);
 
     // configure and verify typings/jsconfig after configuration:
     await context.configureProject();
 
     // verify newly created jsconfig.json
     verifyJsconfigCore(jsconfigPathGlobal);
-    verifyJsconfigCore(jsconfigPathForce);
+    // verify jsconfig.json is not created when there is a tsconfig.json
+    expect(fs.existsSync(tsconfigPathForce)).not.toExist();
     verifyTypingsCore();
+
+    fs.removeSync(tsconfigPathForce);
 });
 
 it('configureCoreAll()', async () => {

packages/lightning-lsp-common/src/context.ts

@@ -395,6 +395,15 @@ export class WorkspaceContext {
         }
     }
 
+    /**
+     * @param modulesDir
+     * @returns whether a tsconfig.json file exists in the same directory of modulesDir
+     */
+    private hasTSConfigOnCore(modulesDir: string): boolean {
+        const tsConfigFile = path.join(modulesDir, '..', 'tsconfig.json');
+        return fs.pathExistsSync(tsConfigFile);
+    }
+
     /**
      * Writes to and updates Jsconfig files and ES Lint files of WorkspaceRoots, optimizing by type
      */
@@ -419,16 +428,22 @@ export class WorkspaceContext {
                 jsConfigTemplate = await fs.readFile(utils.getCoreResource('jsconfig-core.json'), 'utf8');
                 jsConfigContent = this.processTemplate(jsConfigTemplate, { project_root: '../..' });
                 for (const modulesDir of modulesDirs) {
-                    const jsConfigPath = path.join(modulesDir, 'jsconfig.json');
-                    this.updateConfigFile(jsConfigPath, jsConfigContent);
+                    // only writes jsconfig.json if there is no tsconfig.json on core
+                    if (!this.hasTSConfigOnCore(modulesDir)) {
+                        const jsConfigPath = path.join(modulesDir, 'jsconfig.json');
+                        this.updateConfigFile(jsConfigPath, jsConfigContent);
+                    }
                 }
                 break;
             case WorkspaceType.CORE_PARTIAL:
                 jsConfigTemplate = await fs.readFile(utils.getCoreResource('jsconfig-core.json'), 'utf8');
                 jsConfigContent = this.processTemplate(jsConfigTemplate, { project_root: '../..' });
                 for (const modulesDir of modulesDirs) {
-                    const jsConfigPath = path.join(modulesDir, 'jsconfig.json');
-                    this.updateConfigFile(jsConfigPath, jsConfigContent); // no workspace reference yet, that comes in update config file
+                    // only writes jsconfig.json if there is no tsconfig.json on core
+                    if (!this.hasTSConfigOnCore(modulesDir)) {
+                        const jsConfigPath = path.join(modulesDir, 'jsconfig.json');
+                        this.updateConfigFile(jsConfigPath, jsConfigContent); // no workspace reference yet, that comes in update config file
+                    }
                 }
                 break;
         }