a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Asher 2019-09-19 14:41:17 -05:00
parent 22058c5f86
commit 6135630fc0
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/vscode.patch
View File

@ -132,6 +132,19 @@ index 07759dffe5..9148d7c1f0 100644
} else if (typeof process === 'object') { } else if (typeof process === 'object') {
_isWindows = (process.platform === 'win32'); _isWindows = (process.platform === 'win32');
_isMacintosh = (process.platform === 'darwin'); _isMacintosh = (process.platform === 'darwin');
diff --git a/src/vs/base/node/languagePacks.js b/src/vs/base/node/languagePacks.js
index 3ae24454cb..d637d02855 100644
--- a/src/vs/base/node/languagePacks.js
+++ b/src/vs/base/node/languagePacks.js
@@ -146,7 +146,7 @@ function factory(nodeRequire, path, fs, perf) {
function getLanguagePackConfigurations(userDataPath) {
const configFile = path.join(userDataPath, 'languagepacks.json');
try {
- return nodeRequire(configFile);
+ return JSON.parse(fs.readFileSync(configFile, "utf8"));
} catch (err) {
// Do nothing. If we can't read the file we have no
// language pack config.
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
index 44f67f0a0b..00fc1deea8 100644 index 44f67f0a0b..00fc1deea8 100644
--- a/src/vs/code/browser/workbench/workbench.html --- a/src/vs/code/browser/workbench/workbench.html