Skip to content

Commit 8531514

Browse files
committed
Fix failure to resolve arrays error
1 parent 9c9f928 commit 8531514

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

scripts/vscode.patch

+5-2
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,16 @@ index 58ba2e5..4fb6272 100644
350350
- r = require.__$__nodeRequire<T>(modulePath);
351351
+ r = (global as any).nativeNodeRequire(modulePath);
352352
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
353-
index a445750..c7beb13 100644
353+
index a445750..c64712b 100644
354354
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
355355
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
356356
@@ -26 +25,0 @@ import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumen
357357
-import { isString, isNumber } from 'vs/base/common/types';
358-
@@ -116,0 +116 @@ export namespace Diagnostic {
358+
@@ -31 +29,0 @@ import { LogLevel as _MainLogLevel } from 'vs/platform/log/common/log';
359+
-import { coalesce } from 'vs/base/common/arrays';
360+
@@ -116,0 +115,2 @@ export namespace Diagnostic {
359361
+ const { isString, isNumber } = require('vs/base/common/types');
362+
+ const { coalesce } = require('vs/base/common/arrays');
360363
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
361364
index 5897ab9..57b926e 100644
362365
--- a/src/vs/workbench/browser/dnd.ts

0 commit comments

Comments
 (0)