Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-26 17:43:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

EDITOR: Support cross-language imports in editor. (#1518)

Browse Source
This commit is contained in:
Tom Prince 2024-08-02 00:59:31 -06:00 committed by GitHub
parent 2f95d21503
commit 935ac610d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/ScriptEditor/ScriptEditor.ts
View File

@ -13,6 +13,7 @@ import { Settings } from "../Settings/Settings";
import { NetscriptExtra } from "../NetscriptFunctions/Extra"; import { NetscriptExtra } from "../NetscriptFunctions/Extra";
import * as enums from "../Enums"; import * as enums from "../Enums";
import { ns } from "../NetscriptFunctions"; import { ns } from "../NetscriptFunctions";
import { isLegacyScript } from "../Paths/ScriptFilePath";
/** Event emitter used for tracking when changes have been made to a content file. */ /** Event emitter used for tracking when changes have been made to a content file. */
export const fileEditEvents = new EventEmitter<[hostname: string, filename: ContentFilePath]>(); export const fileEditEvents = new EventEmitter<[hostname: string, filename: ContentFilePath]>();
@ -63,9 +64,9 @@ export class ScriptEditor {
// Add ts definitions for API // Add ts definitions for API
const source = netscriptDefinitions.replace(/export /g, ""); const source = netscriptDefinitions.replace(/export /g, "");
for (const [language, languageDefaults] of [ for (const [language, languageDefaults, getLanguageWorker] of [
["javascript", monaco.languages.typescript.javascriptDefaults], ["javascript", monaco.languages.typescript.javascriptDefaults, monaco.languages.typescript.getJavaScriptWorker],
["typescript", monaco.languages.typescript.typescriptDefaults], ["typescript", monaco.languages.typescript.typescriptDefaults, monaco.languages.typescript.getTypeScriptWorker],
] as const) { ] as const) {
languageDefaults.addExtraLib(source, "netscript.d.ts"); languageDefaults.addExtraLib(source, "netscript.d.ts");
languageDefaults.addExtraLib(reactTypes, "react.d.ts"); languageDefaults.addExtraLib(reactTypes, "react.d.ts");
@ -86,6 +87,8 @@ export class ScriptEditor {
strict: true, strict: true,
noImplicitAny: language === "typescript", noImplicitAny: language === "typescript",
noImplicitReturns: true, noImplicitReturns: true,
// Allow processing of javascript files, for handling cross-language imports.
allowJs: true,
}); });
languageDefaults.setDiagnosticsOptions({ languageDefaults.setDiagnosticsOptions({
...languageDefaults.getDiagnosticsOptions(), ...languageDefaults.getDiagnosticsOptions(),
@ -100,6 +103,27 @@ export class ScriptEditor {
2686, 2686,
], ],
}); });
// Sync all javascript and typescript text models to both language servers.
//
// `monaco.languages.typescript.get{Java,Type}ScriptWorker` returns a promise that
// fires with a function that takes a list of `monaco.Uri`s and sync's them with the
// worker. (It also returns the worker, but we don't care about that.) However, it
// returns a reject promise if the language worker is not loaded yet, so we wait to
// call it until the language gets loaded.
const languageWorker = new Promise<(...uris: monaco.Uri[]) => unknown>((resolve) =>
monaco.languages.onLanguage(language, () => getLanguageWorker().then(resolve)),
);
// Whenever a model is created, arange for it synced to the language server.
monaco.editor.onDidCreateModel((model) => {
if (language === "typescript" && isLegacyScript(model.uri.path)) {
// Don't sync legacy scripts to typescript worker.
return;
}
if (["javascript", "typescript"].includes(model.getLanguageId())) {
languageWorker.then((cb) => cb(model.uri));
}
});
} }
monaco.languages.json.jsonDefaults.setModeConfiguration({ monaco.languages.json.jsonDefaults.setModeConfiguration({