SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-23 00:22:56 +01:00
Code Issues Projects Releases Packages Activity

Fixed typos and other improvements per code review

Browse source
This commit is contained in:
placatus 2019-03-01 00:01:35 +02:00
parent 292108c5ee
commit 6c73d7f708
4 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/bundle.js
View file

@ -58,9 +58,8 @@ function bundleOne(moduleId, exclude) {
} }
function updateImports(moduleId) { function updateImports(moduleId) {
console.log(`ESM: updating relative imports paths for ${moduleId}...`);
const filePath = path.join(REPO_ROOT, 'release/esm/' + moduleId + '.js'); const filePath = path.join(REPO_ROOT, 'release/esm/' + moduleId + '.js');
var fileContents = fs.readFileSync(filePath).toString(); let fileContents = fs.readFileSync(filePath).toString();
fileContents = fileContents.replace(/vs\/basic-languages\//g, "../../basic-languages/"); fileContents = fileContents.replace(/vs\/basic-languages\//g, "../../basic-languages/");
fs.writeFileSync(filePath, fileContents); fs.writeFileSync(filePath, fileContents);
} }

2
src/languageFeatures.ts
View file

@ -134,7 +134,7 @@ export class DiagnostcsAdapter extends Adapter {
} }
} }
}); });
let redoDiagosticsCallback = () => { const redoDiagosticsCallback = () => {
// redo diagnostics when options change // redo diagnostics when options change
for (const model of monaco.editor.getModels()) { for (const model of monaco.editor.getModels()) {
onModelRemoved(model); onModelRemoved(model);

25
src/monaco.contribution.ts
View file

@ -27,12 +27,12 @@ export class LanguageServiceDefaultsImpl implements monaco.languages.typescript.
private _languageId: string; private _languageId: string;
private _eagerExtraLibSync: boolean = true; private _eagerExtraLibSync: boolean = true;
constructor(langualgeId: string, compilerOptions: monaco.languages.typescript.CompilerOptions, diagnosticsOptions: monaco.languages.typescript.DiagnosticsOptions) { constructor(languageId: string, compilerOptions: monaco.languages.typescript.CompilerOptions, diagnosticsOptions: monaco.languages.typescript.DiagnosticsOptions) {
this._extraLibs = Object.create(null); this._extraLibs = Object.create(null);
this._workerMaxIdleTime = 2 * 60 * 1000; this._workerMaxIdleTime = 2 * 60 * 1000;
this.setCompilerOptions(compilerOptions); this.setCompilerOptions(compilerOptions);
this.setDiagnosticsOptions(diagnosticsOptions); this.setDiagnosticsOptions(diagnosticsOptions);
this._languageId = langualgeId; this._languageId = languageId;
} }
get onDidChange(): IEvent<monaco.languages.typescript.LanguageServiceDefaults> { get onDidChange(): IEvent<monaco.languages.typescript.LanguageServiceDefaults> {
@ -57,12 +57,14 @@ export class LanguageServiceDefaultsImpl implements monaco.languages.typescript.
} }
if (this._extraLibs[filePath]) { if (this._extraLibs[filePath]) {
if(this._extraLibs[filePath].content !== content) {
this._extraLibs[filePath].version++; this._extraLibs[filePath].version++;
this._extraLibs[filePath].content = content; this._extraLibs[filePath].content = content;
}
} else { } else {
this._extraLibs[filePath] = { this._extraLibs[filePath] = {
content: content, content: content,
version: 1 version: 1,
}; };
} }
if (this._eagerExtraLibSync) { if (this._eagerExtraLibSync) {
@ -78,12 +80,14 @@ export class LanguageServiceDefaultsImpl implements monaco.languages.typescript.
}; };
} }
async syncExtraLibs() { async syncExtraLibs(): Promise<void> {
try { try {
let worker; let worker;
// we don't care if the get language worker fails.
// This happens because the worker initialzies much slower than the addExtraLib calls
try { try {
// we don't care if the get language worker fails.
// This happens if addExtraLib is called before the worker has initialized.
// however, when the worker has finished downloading and initializes,
// it does so with the latest extraLibs so no sync issue can appear
worker = await getLanguageWorker(this._languageId); worker = await getLanguageWorker(this._languageId);
} catch (ignored) { } catch (ignored) {
return; return;
@ -191,8 +195,13 @@ const languageDefaultOptions = {
const languageDefaults: { [name: string]: LanguageServiceDefaultsImpl } = {}; const languageDefaults: { [name: string]: LanguageServiceDefaultsImpl } = {};
function setupLanguageServiceDefaults(languageId, isTypescript) { /**
const languageOptions = languageDefaultOptions[isTypescript ? "typescript" : "javascript"] * Generate the LanguageServiceDefaults for a new langauage with the given name
* @param languageId Name of the language
* @param isTypescriptBased Whether the language inherits from a typescript base or a javascript one
*/
function setupLanguageServiceDefaults(languageId: string, isTypescriptBased: boolean) {
const languageOptions = isTypescriptBased ? languageDefaultOptions.typescript : languageDefaultOptions.javascript;
languageDefaults[languageId] = new LanguageServiceDefaultsImpl(languageId, languageOptions.compilerOptions, languageOptions.diagnosticsOptions); languageDefaults[languageId] = new LanguageServiceDefaultsImpl(languageId, languageOptions.compilerOptions, languageOptions.diagnosticsOptions);
} }

2
src/monaco.d.ts vendored
View file

@ -174,7 +174,7 @@ declare module monaco.languages.typescript {
/** /**
* If EagerExtraLibSync is disabled, call this to trigger the changes. * If EagerExtraLibSync is disabled, call this to trigger the changes.
*/ */
syncExtraLibs(): void; syncExtraLibs(): Promise<void>;
} }
export var typescriptDefaults: LanguageServiceDefaults; export var typescriptDefaults: LanguageServiceDefaults;