fix: intellisense not working (#667)

electron · Apr 22, 2021 · e6006fb · e6006fb
1 parent 980284a
commit e6006fb
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 24 deletions.
diff --git a/src/main/windows.ts b/src/main/windows.ts
@@ -25,7 +25,6 @@ export function getMainWindowOptions(): Electron.BrowserWindowConstructorOptions
     webPreferences: {
       webviewTag: false,
       nodeIntegration: true,
-      nodeIntegrationInWorker: true,
       contextIsolation: false,
       preload: path.join(__dirname, '..', 'preload', 'preload'),
     },

diff --git a/src/renderer/npm.ts b/src/renderer/npm.ts
@@ -1,5 +1,6 @@
 import { EditorValues } from '../interfaces';
 import { exec } from '../utils/exec';
+import decomment from 'decomment';
 
 // Making TypeScript happy and avoiding "esModuleInterop" issues
 const { builtinModules } = require('module');
@@ -111,7 +112,7 @@ export async function findModules(input: string) {
   let match: RegExpMatchArray | null;
 
   /* decomment code with the esprima parser */
-  const code = await decommentWithWorker(input);
+  const code = await decomment(input);
 
   /* grab all global require matches in the text */
   while ((match = requiregx.exec(code) || null)) {
@@ -166,16 +167,3 @@ export function packageRun(
 ): Promise<string> {
   return exec(dir, `${packageManager} run ${command}`);
 }
-
-function decommentWithWorker(input: string): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const worker = new Worker('../utils/decomment.ts');
-    worker.onmessage = function (event: MessageEvent<string>) {
-      resolve(event.data);
-    };
-    worker.postMessage(input);
-    worker.onerror = function (e) {
-      reject(e);
-    };
-  });
-}
diff --git a/src/utils/decomment.ts b/src/utils/decomment.ts
diff --git a/tests/main/windows-spec.ts b/tests/main/windows-spec.ts
@@ -38,7 +38,6 @@ describe('windows', () => {
       webPreferences: {
         webviewTag: false,
         nodeIntegration: true,
-        nodeIntegrationInWorker: true,
         contextIsolation: false,
         preload: '/fake/path',
       },

diff --git a/tests/renderer/npm-spec.ts b/tests/renderer/npm-spec.ts
@@ -10,13 +10,10 @@ import {
 } from '../../src/renderer/npm';
 import { exec } from '../../src/utils/exec';
 import { overridePlatform, resetPlatform } from '../utils';
-import MockDecommentWorker from '../mocks/worker';
 import { DefaultEditorId } from '../../src/interfaces';
 jest.mock('decomment');
 jest.mock('../../src/utils/exec');
 
-window.Worker = MockDecommentWorker;
-
 describe('npm', () => {
   const mockBuiltins = `
     function hello() {