Skip to content

fix: Show alert to work with code-server #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2019
Merged

fix: Show alert to work with code-server #579

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions src/vscodeModules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,21 @@ import * as vscode from "vscode";

const appRoot = vscode.env.appRoot;

// Try load only in VSCode node_modules, like .vsix files (without dev dependencies)
module.paths = [
path.join(appRoot, "node_modules.asar"),
path.join(appRoot, "node_modules"), // VSCode < 1.21.0
];
function loadVSCodeModule(id: string) {
try {
return require(`${appRoot}/node_modules.asar/${id}`);
} catch (ea) {
// Ignore
}

import * as iconv from "iconv-lite";
import * as jschardet from "jschardet";
const baseDir = path.dirname(process.execPath);
try {
module.paths.unshift(`${baseDir}/node_modules`);
return require(id);
} catch (eb) {
vscode.window.showErrorMessage(`Missing dependency, go to "${baseDir}" and run: npm install ${id}`);
}
}

export { iconv, jschardet };
export const iconv = loadVSCodeModule("iconv-lite") as typeof import("iconv-lite");
export const jschardet = loadVSCodeModule("jschardet") as typeof import("jschardet");