Merge pull request #1515 from danielyxie/dev

improve monokai by making the language a superset of javascript

src/ScriptEditor/ui/ScriptEditorRoot.tsx

@@ -55,7 +55,7 @@ export function SetupTextEditor(): void {
   symbols = populate(ns);
 
   const exclude = ["heart", "break", "exploit", "bypass", "corporation"];
-  symbols = symbols.filter((symbol: string) => !exclude.includes(symbol));
+  symbols = symbols.filter((symbol: string) => !exclude.includes(symbol)).sort();
 }
 
 interface IProps {
@@ -311,6 +311,16 @@ export function Root(props: IProps): React.ReactElement {
         return { suggestions: suggestions };
       },
     });
+    (async function () {
+      const l = await monaco.languages
+        .getLanguages()
+        .find((l: any) => l.id === "javascript")
+        .loader();
+      l.language.tokenizer.root.unshift(["ns", { token: "ns" }]);
+      for (const symbol of symbols) l.language.tokenizer.root.unshift(["\\." + symbol, { token: "netscriptfunction" }]);
+      console.log(l);
+    })();
+
     monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, "netscript.d.ts");
     monaco.languages.typescript.typescriptDefaults.addExtraLib(libSource, "netscript.d.ts");
     loadThemes(monaco);

src/ScriptEditor/ui/themes.ts

@@ -31,7 +31,14 @@ export async function loadThemes(monaco: { editor: any }): Promise<void> {
         token: "storage.type.function.js",
         foreground: "ae81ff",
       },
-
+      {
+        token: "ns",
+        foreground: "97d92b",
+      },
+      {
+        token: "netscriptfunction",
+        foreground: "53d3e4",
+      },
       //   {
       //     foreground: "ae81ff",
       //     token: "entity.name.function",

src/Settings/Settings.ts

@@ -239,7 +239,7 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = {
   SuppressMessages: defaultSettings.SuppressMessages,
   SuppressTravelConfirmation: defaultSettings.SuppressTravelConfirmation,
   SuppressBladeburnerPopup: defaultSettings.SuppressBladeburnerPopup,
-  MonacoTheme: "vs-dark",
+  MonacoTheme: "monokai",
   MonacoInsertSpaces: false,
   MonacoFontSize: 20,