Skip to content

Commit 6135630

Browse files
committed
Fix not being able to change language while code-server is running
See #948. Only applies if code-server already tried to load a language.
1 parent 22058c5 commit 6135630

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

scripts/vscode.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,19 @@ index 07759dffe5..9148d7c1f0 100644
132132
} else if (typeof process === 'object') {
133133
_isWindows = (process.platform === 'win32');
134134
_isMacintosh = (process.platform === 'darwin');
135+
diff --git a/src/vs/base/node/languagePacks.js b/src/vs/base/node/languagePacks.js
136+
index 3ae24454cb..d637d02855 100644
137+
--- a/src/vs/base/node/languagePacks.js
138+
+++ b/src/vs/base/node/languagePacks.js
139+
@@ -146,7 +146,7 @@ function factory(nodeRequire, path, fs, perf) {
140+
function getLanguagePackConfigurations(userDataPath) {
141+
const configFile = path.join(userDataPath, 'languagepacks.json');
142+
try {
143+
- return nodeRequire(configFile);
144+
+ return JSON.parse(fs.readFileSync(configFile, "utf8"));
145+
} catch (err) {
146+
// Do nothing. If we can't read the file we have no
147+
// language pack config.
135148
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
136149
index 44f67f0a0b..00fc1deea8 100644
137150
--- a/src/vs/code/browser/workbench/workbench.html

0 commit comments

Comments
 (0)