Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d2da4cf

Browse files
Fix errors appearing
1 parent a1136b3 commit d2da4cf

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

‎scripts/vscode.patch‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,17 @@ index 25e74c8..0bed89e 100644
349349
@@ -769 +769 @@ function loadCommonJSModule<T>(logService: ILogService, modulePath: string, acti
350350
- r = require.__$__nodeRequire<T>(modulePath);
351351
+ r = (global as any).nativeNodeRequire(modulePath);
352+
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
353+
index 84406b8..cffd952 100644
354+
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
355+
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
356+
@@ -26 +25,0 @@ import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumen
357+
-import { isString, isNumber } from 'vs/base/common/types';
358+
@@ -31 +29,0 @@ import { LogLevel as _MainLogLevel } from 'vs/platform/log/common/log';
359+
-import { coalesce } from 'vs/base/common/arrays';
360+
@@ -117,0 +116,2 @@ export namespace Diagnostic {
361+
+ const { isString, isNumber } = require('vs/base/common/types');
362+
+ const { coalesce } = require('vs/base/common/arrays');
352363
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
353364
index 7b6ad89..3190356 100644
354365
--- a/src/vs/workbench/browser/dnd.ts
@@ -844,7 +855,7 @@ index 48ef482..dc47f81 100644
844855
- placeHolder: isMacintosh ? nls.localize('openRecentPlaceHolderMac', "Select to open (hold Cmd-key to open in new window)") : nls.localize('openRecentPlaceHolder', "Select to open (hold Ctrl-key to open in new window)"),
845856
+ placeHolder: browser.isMacintosh ? nls.localize('openRecentPlaceHolderMac', "Select to open (hold Cmd-key to open in new window)") : nls.localize('openRecentPlaceHolder', "Select to open (hold Ctrl-key to open in new window)"),
846857
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
847-
index 71bc992..59a1a20 100644
858+
index 71bc992..97cbb71 100644
848859
--- a/src/vs/workbench/electron-browser/main.contribution.ts
849860
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
850861
@@ -13 +13,2 @@ import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /