From ed62a3ebc24f6a1290c68b44742795903145b5ba Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Fri, 20 Aug 2021 02:00:25 -0400 Subject: [PATCH] deleted ace and monaco --- src/Script/ScriptHelpers.js | 16 - src/ScriptEditor/Ace.js | 329 ------- src/ScriptEditor/AceNetscriptMode.js | 807 ----------------- src/ScriptEditor/CodeMirror.js | 596 ------------- src/ScriptEditor/CodeMirrorNetscriptLint.js | 83 -- src/ScriptEditor/CodeMirrorNetscriptMode.js | 939 -------------------- src/ScriptEditor/ScriptEditor.js | 61 -- src/Terminal.jsx | 2 - 8 files changed, 2833 deletions(-) delete mode 100644 src/ScriptEditor/Ace.js delete mode 100644 src/ScriptEditor/AceNetscriptMode.js delete mode 100644 src/ScriptEditor/CodeMirror.js delete mode 100644 src/ScriptEditor/CodeMirrorNetscriptLint.js delete mode 100644 src/ScriptEditor/CodeMirrorNetscriptMode.js delete mode 100644 src/ScriptEditor/ScriptEditor.js diff --git a/src/Script/ScriptHelpers.js b/src/Script/ScriptHelpers.js index dad34cfe7..07129f4f2 100644 --- a/src/Script/ScriptHelpers.js +++ b/src/Script/ScriptHelpers.js @@ -13,8 +13,6 @@ import { ITutorial, } from "../InteractiveTutorial"; import { Player } from "../Player"; -import { AceEditor } from "../ScriptEditor/Ace"; -import { CodeMirrorEditor } from "../ScriptEditor/CodeMirror"; import { CursorPositions } from "../ScriptEditor/CursorPositions"; import { AllServers } from "../Server/AllServers"; import { processSingleServerGrowth } from "../Server/ServerHelpers"; @@ -30,20 +28,6 @@ import { dialogBoxCreate } from "../../utils/DialogBox"; import { compareArrays } from "../../utils/helpers/compareArrays"; import { createElement } from "../../utils/uiHelpers/createElement"; -var scriptEditorRamText = null; - -export function getCurrentEditor() { - switch (Settings.Editor) { - case EditorSetting.Ace: - return AceEditor; - case EditorSetting.CodeMirror: - return CodeMirrorEditor; - default: - throw new Error(`Invalid Editor Setting: ${Settings.Editor}`); - return null; - } -} - // TODO(hydroflame): move to Monaco mount/unmount //Define key commands in script editor (ctrl o to save + close, etc.) $(document).keydown(function(e) { diff --git a/src/ScriptEditor/Ace.js b/src/ScriptEditor/Ace.js deleted file mode 100644 index 78f25f0ec..000000000 --- a/src/ScriptEditor/Ace.js +++ /dev/null @@ -1,329 +0,0 @@ -import { ScriptEditor } from "./ScriptEditor"; - -import ace from 'brace'; - -import 'brace/mode/javascript'; -import './AceNetscriptMode'; -import 'brace/theme/chaos'; -import 'brace/theme/chrome'; -import 'brace/theme/monokai'; -import 'brace/theme/solarized_dark'; -import 'brace/theme/solarized_light'; -import 'brace/theme/terminal'; -import 'brace/theme/twilight'; -import 'brace/theme/xcode'; -import "brace/keybinding/vim"; -import "brace/keybinding/emacs"; -import "brace/ext/language_tools"; - -import { NetscriptFunctions } from "../NetscriptFunctions"; -import { Settings } from "../Settings/Settings"; -import { AceKeybindingSetting } from "../Settings/SettingEnums"; - -import { clearEventListeners } from "../../utils/uiHelpers/clearEventListeners"; -import { createElement } from "../../utils/uiHelpers/createElement"; -import { createOptionElement } from "../../utils/uiHelpers/createOptionElement"; -import { removeChildrenFromElement } from "../../utils/uiHelpers/removeChildrenFromElement"; - -// Wrapper for Ace editor -const Keybindings = { - ace: null, - vim: "ace/keyboard/vim", - emacs: "ace/keyboard/emacs", -}; - -function validateInitializationParamters(params) { - if (params.saveAndCloseFn == null) { return false; } // Save & close button function - if (params.quitFn == null) { return false; } // Quitting editor, aka Engine.loadTerminalContent - - return true; -} - -class AceEditorWrapper extends ScriptEditor { - constructor() { - super(); - this.vimCommandDisplayWrapper = null; - } - - init(params) { - if (this.editor != null) { - console.error(`AceEditor.init() called when it's already initialized`); - return false; - } - - // Validate/Sanitize input - if (!validateInitializationParamters(params)) { - console.error(`'params' argument passed into initAceEditor() does not have proper properties`); - return false; - } - - // Store the filename input - this.filenameInput = document.getElementById("script-editor-filename"); - if (this.filenameInput == null) { - console.error(`Could not get Script Editor filename element (id=script-editor-filename)`); - return false; - } - - // Initialize ACE Script editor - this.editor = ace.edit('ace-editor'); - this.editor.getSession().setMode('ace/mode/netscript'); - this.editor.setTheme('ace/theme/monokai'); - const editorElement = document.getElementById('ace-editor'); - if (editorElement == null) { return false; } - editorElement.style.fontSize = '16px'; - this.editor.setOption("showPrintMargin", false); - - // Configure some of the VIM keybindings - ace.config.loadModule('ace/keyboard/vim', function(module) { - var VimApi = module.CodeMirror.Vim; - VimApi.defineEx('write', 'w', function(/*cm, input*/) { - params.saveAndCloseFn(); - }); - VimApi.defineEx('quit', 'q', function(/*cm, input*/) { - params.quitFn(); - }); - VimApi.defineEx('xwritequit', 'x', function(/*cm, input*/) { - params.saveAndCloseFn(); - }); - VimApi.defineEx('wqwritequit', 'wq', function(/*cm, input*/) { - params.saveAndCloseFn(); - }); - }); - - // Store a reference to the VIM command display - this.vimCommandDisplayWrapper = document.getElementById("codemirror-vim-command-display-wrapper"); - if (this.vimCommandDisplayWrapper == null) { - console.error(`Could not get Vim Command Display element (id=codemirror-vim-command-display-wrapper)`); - return false; - } - - //Function autocompleter - this.editor.setOption("enableBasicAutocompletion", true); - var autocompleter = { - getCompletions: function(editor, session, pos, prefix, callback) { - if (prefix.length === 0) {callback(null, []); return;} - var words = []; - var fns = NetscriptFunctions(null); - for (let name in fns) { - if (fns.hasOwnProperty(name)) { - words.push({ - name: name, - value: name, - }); - - //Get functions from namespaces - const namespaces = ["bladeburner", "hacknet", "codingcontract", "gang", "sleeve"]; - if (namespaces.includes(name)) { - let namespace = fns[name]; - if (typeof namespace !== "object") {continue;} - let namespaceFns = Object.keys(namespace); - for (let i = 0; i < namespaceFns.length; ++i) { - words.push({ - name: namespaceFns[i], - value: namespaceFns[i], - }); - } - } - } - } - callback(null, words); - }, - } - this.editor.completers = [autocompleter]; - - return true; - } - - initialized() { - return (this.editor != null); - } - - // Create the configurable Options for this Editor - create() { - function safeGetElementById(id, whatFor="") { - const elem = document.getElementById(id); - if (elem == null) { - throw new Error(`Could not find ${whatFor} DOM element(id=${id})`); - } - - return elem; - } - - function safeClearEventListeners(id, whatFor="") { - const elem = clearEventListeners(id); - if (elem == null) { - throw new Error(`Could not find ${whatFor} DOM element(id=${id})`); - } - - return elem; - } - - try { - // Set editor to visible - const elem = document.getElementById("ace-editor"); - if (elem instanceof HTMLElement) { - elem.style.display = "block"; - } - - // Make sure the Vim command display from CodeMirror is invisible - if (this.vimCommandDisplayWrapper instanceof HTMLElement) { - this.vimCommandDisplayWrapper.style.display = "none"; - } - - // Theme - const themeDropdown = safeClearEventListeners("script-editor-option-theme", "Theme Selector"); - removeChildrenFromElement(themeDropdown); - themeDropdown.add(createOptionElement("Chaos")); - themeDropdown.add(createOptionElement("Chrome")); - themeDropdown.add(createOptionElement("Monokai")); - themeDropdown.add(createOptionElement("Solarized Dark", "Solarized_Dark")); - themeDropdown.add(createOptionElement("Solarized Light", "Solarized_Light")); - themeDropdown.add(createOptionElement("Terminal")); - themeDropdown.add(createOptionElement("Twilight")); - themeDropdown.add(createOptionElement("XCode")); - if (Settings.EditorTheme) { - var initialIndex = 2; - for (var i = 0; i < themeDropdown.options.length; ++i) { - if (themeDropdown.options[i].value === Settings.EditorTheme) { - initialIndex = i; - break; - } - } - themeDropdown.selectedIndex = initialIndex; - } else { - themeDropdown.selectedIndex = 2; - } - - themeDropdown.onchange = () => { - const val = themeDropdown.value; - Settings.EditorTheme = val; - const themePath = "ace/theme/" + val.toLowerCase(); - this.editor.setTheme(themePath); - }; - themeDropdown.onchange(); - - // Keybinding - const keybindingDropdown = safeClearEventListeners("script-editor-option-keybinding", "Keybinding Selector"); - removeChildrenFromElement(keybindingDropdown); - keybindingDropdown.add(createOptionElement("Ace", AceKeybindingSetting.Ace)); - keybindingDropdown.add(createOptionElement("Vim", AceKeybindingSetting.Vim)); - keybindingDropdown.add(createOptionElement("Emacs", AceKeybindingSetting.Emacs)); - if (Settings.EditorKeybinding) { - // Sanitize the Keybinding setting - if (!(Object.values(AceKeybindingSetting).includes(Settings.EditorKeybinding))) { - Settings.EditorKeybinding = AceKeybindingSetting.Ace; - } - var initialIndex = 0; - for (var i = 0; i < keybindingDropdown.options.length; ++i) { - if (keybindingDropdown.options[i].value === Settings.EditorKeybinding) { - initialIndex = i; - break; - } - } - keybindingDropdown.selectedIndex = initialIndex; - } else { - keybindingDropdown.selectedIndex = 0; - } - keybindingDropdown.onchange = () => { - var val = keybindingDropdown.value; - Settings.EditorKeybinding = val; - this.editor.setKeyboardHandler(Keybindings[val.toLowerCase()]); - }; - keybindingDropdown.onchange(); - - // Highlight Active line - const highlightActiveChkBox = safeClearEventListeners("script-editor-option-highlightactiveline", "Active Line Checkbox"); - highlightActiveChkBox.checked = Settings.EditorHighlightActiveLine; - highlightActiveChkBox.onchange = () => { - Settings.EditorHighlightActiveLine = highlightActiveChkBox.checked; - this.editor.setHighlightActiveLine(highlightActiveChkBox.checked); - }; - - // Show Invisibles - const showInvisiblesChkBox = safeClearEventListeners("script-editor-option-showinvisibles", "Show Invisible Checkbox"); - showInvisiblesChkBox.checked = Settings.EditorShowInvisibles; - showInvisiblesChkBox.onchange = () => { - Settings.EditorShowInvisibles = showInvisiblesChkBox.checked; - this.editor.setShowInvisibles(showInvisiblesChkBox.checked); - }; - - // Use Soft Tab - const softTabChkBox = safeClearEventListeners("script-editor-option-usesofttab", "Soft Tab Checkbox"); - softTabChkBox.checked = Settings.EditorUseSoftTab; - softTabChkBox.onchange = () => { - Settings.EditorUseSoftTab = softTabChkBox.checked; - this.editor.getSession().setUseSoftTabs(softTabChkBox.checked); - }; - - // Some helper functions for dealing with flexible options - function resetFlexibleOption(id) { - const fieldset = safeGetElementById(id); - removeChildrenFromElement(fieldset); - fieldset.style.display = "block"; - return fieldset; - } - - function removeFlexibleOption(id) { - // This doesn't really remove it, just sets it to invisible - const fieldset = resetFlexibleOption(id); - fieldset.style.display = "none"; - return fieldset; - } - - // Jshint Maxerr (Flex 1) - const flex1Fieldset = resetFlexibleOption("script-editor-option-flex1-fieldset"); - const flex1Id = "script-editor-option-maxerr"; - const flex1ValueLabel = createElement("em", { innerText: "200" }); - flex1Fieldset.appendChild(createElement("label", { - for: flex1Id, - innerText: "Max Error Count", - })); - const flex1Input = createElement("input", { - id: flex1Id, - max: "1000", - min: "50", - name: flex1Id, - step: "1", - type: "range", - value: "200", - changeListener: () => { - this.editor.getSession().$worker.send("changeOptions", [{maxerr:flex1Input.value}]); - flex1ValueLabel.innerText = flex1Input.value; - }, - }); - flex1Fieldset.appendChild(flex1Input); - flex1Fieldset.appendChild(flex1ValueLabel); - - // Nothing for Flex Options 2-4 - removeFlexibleOption("script-editor-option-flex2-fieldset"); - removeFlexibleOption("script-editor-option-flex3-fieldset"); - removeFlexibleOption("script-editor-option-flex4-fieldset"); - } catch(e) { - console.error(`Exception caught: ${e}`); - return false; - } - } - - isFocused() { - if (this.editor == null) { return false; } - return this.editor.isFocused(); - } - - // Sets the editor to be invisible. Does not require this class to be initialized - setInvisible() { - const elem = document.getElementById("ace-editor"); - if (elem instanceof HTMLElement) { - elem.style.display = "none"; - } - } - - getCursor() { - return this.editor.getCursorPosition(); - } - - setCursor(pos) { - this.editor.gotoLine(pos.row+1, pos.column); - } -} - -export const AceEditor = new AceEditorWrapper(); diff --git a/src/ScriptEditor/AceNetscriptMode.js b/src/ScriptEditor/AceNetscriptMode.js deleted file mode 100644 index d8d6c2233..000000000 --- a/src/ScriptEditor/AceNetscriptMode.js +++ /dev/null @@ -1,807 +0,0 @@ -//This file should be copied into brace/mode/netscript.js -import { NetscriptFunctions } from '../NetscriptFunctions'; - -ace.define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(acequire, exports) { -"use strict"; - -var oop = acequire("../lib/oop"); -var TextHighlightRules = acequire("./text_highlight_rules").TextHighlightRules; - -var DocCommentHighlightRules = function() { - this.$rules = { - "start" : [ { - token : "comment.doc.tag", - regex : "@[\\w\\d_]+", // TODO: fix email addresses - }, - DocCommentHighlightRules.getTagRule(), - { - defaultToken : "comment.doc", - caseInsensitive: true, - }], - }; -}; - -oop.inherits(DocCommentHighlightRules, TextHighlightRules); - -DocCommentHighlightRules.getTagRule = function() { - return { - token : "comment.doc.tag.storage.type", - regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b", - }; -} - -DocCommentHighlightRules.getStartRule = function(start) { - return { - token : "comment.doc", // doc comment - regex : "\\/\\*(?=\\*)", - next : start, - }; -}; - -DocCommentHighlightRules.getEndRule = function (start) { - return { - token : "comment.doc", // closing comment - regex : "\\*\\/", - next : start, - }; -}; - -exports.DocCommentHighlightRules = DocCommentHighlightRules; - -}); - -ace.define("ace/mode/netscript_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"], function(acequire, exports) { -"use strict"; - -var oop = acequire("../lib/oop"); -var DocCommentHighlightRules = acequire("./doc_comment_highlight_rules").DocCommentHighlightRules; -var TextHighlightRules = acequire("./text_highlight_rules").TextHighlightRules; -var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*"; - -let functions = (function(){ - function recursiveKeywords(namespace) { - let keywords = []; - for(const elem of Object.keys(namespace)) { - keywords.push(elem); - if(typeof namespace[elem] == 'object') { - keywords = keywords.concat(recursiveKeywords(namespace[elem])); - } - } - return keywords; - } - - const ns = NetscriptFunctions(null); - // reverse is important so that both clearLog and clear are highlighted. - return recursiveKeywords(ns).sort().reverse().join("|"); -})(); - -var NetscriptHighlightRules = function(options) { - var keywordMapper = this.createKeywordMapper({ - "variable.language": - "Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" + // Constructors - "Namespace|QName|XML|XMLList|" + // E4X - "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" + - "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" + - "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" + // Errors - "SyntaxError|TypeError|URIError|" + - "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" + // Non-constructor functions - "isNaN|parseFloat|parseInt|" + - "ns|" + functions +"|" + - "JSON|Math|" + // Other - "this|arguments|prototype|window|document" , // Pseudo - "keyword": - "const|yield|import|get|set|async|await|" + - "break|case|catch|continue|default|delete|do|else|finally|for|function|" + - "if|in|of|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|" + - "__parent__|__count__|escape|unescape|with|__proto__|" + - "class|enum|extends|super|export|implements|private|public|interface|package|protected|static", - "storage.type": - "const|let|var|function", - "constant.language": - "null|Infinity|NaN|undefined", - "support.function": - "alert", - "constant.language.boolean": "true|false", - }, "identifier"); - var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void"; - - var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex - "u[0-9a-fA-F]{4}|" + // unicode - "u{[0-9a-fA-F]{1,6}}|" + // es6 unicode - "[0-2][0-7]{0,2}|" + // oct - "3[0-7][0-7]?|" + // oct - "[4-7][0-7]?|" + //oct - ".)"; - - this.$rules = { - "no_regex" : [ - DocCommentHighlightRules.getStartRule("doc-start"), - comments("no_regex"), - { - token : "string", - regex : "'(?=.)", - next : "qstring", - }, { - token : "string", - regex : '"(?=.)', - next : "qqstring", - }, { - token : "constant.numeric", // hex - regex : /0(?:[xX][0-9a-fA-F]+|[bB][01]+)\b/, - }, { - token : "constant.numeric", // float - regex : /[+-]?\d[\d_]*(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/, - }, { - token : [ - "storage.type", "punctuation.operator", "support.function", - "punctuation.operator", "entity.name.function", "text","keyword.operator", - ], - regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)", - next: "function_arguments", - }, { - token : [ - "storage.type", "punctuation.operator", "entity.name.function", "text", - "keyword.operator", "text", "storage.type", "text", "paren.lparen", - ], - regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()", - next: "function_arguments", - }, { - token : [ - "entity.name.function", "text", "keyword.operator", "text", "storage.type", - "text", "paren.lparen", - ], - regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()", - next: "function_arguments", - }, { - token : [ - "storage.type", "punctuation.operator", "entity.name.function", "text", - "keyword.operator", "text", - "storage.type", "text", "entity.name.function", "text", "paren.lparen", - ], - regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()", - next: "function_arguments", - }, { - token : [ - "storage.type", "text", "entity.name.function", "text", "paren.lparen", - ], - regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()", - next: "function_arguments", - }, { - token : [ - "entity.name.function", "text", "punctuation.operator", - "text", "storage.type", "text", "paren.lparen", - ], - regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()", - next: "function_arguments", - }, { - token : [ - "text", "text", "storage.type", "text", "paren.lparen", - ], - regex : "(:)(\\s*)(function)(\\s*)(\\()", - next: "function_arguments", - }, { - token : "keyword", - regex : "(?:" + kwBeforeRe + ")\\b", - next : "start", - }, { - token : ["support.constant"], - regex : /that\b/, - }, { - token : ["storage.type", "punctuation.operator", "support.function.firebug"], - regex : /(console)(\.)(warn|info|log|error|time|trace|timeEnd|assert)\b/, - }, { - token : keywordMapper, - regex : identifierRe, - }, { - token : "punctuation.operator", - regex : /[.](?![.])/, - next : "property", - }, { - token : "keyword.operator", - regex : /--|\+\+|\.{3}|===|==|=|!=|!==|<+=?|>+=?|!|&&|\|\||\?:|[!$%&*+\-~\/^]=?/, - next : "start", - }, { - token : "punctuation.operator", - regex : /[?:,;.]/, - next : "start", - }, { - token : "paren.lparen", - regex : /[\[({]/, - next : "start", - }, { - token : "paren.rparen", - regex : /[\])}]/, - }, { - token: "comment", - regex: /^#!.*$/, - }, - ], - property: [{ - token : "text", - regex : "\\s+", - }, { - token : [ - "storage.type", "punctuation.operator", "entity.name.function", "text", - "keyword.operator", "text", - "storage.type", "text", "entity.name.function", "text", "paren.lparen", - ], - regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(?:(\\s+)(\\w+))?(\\s*)(\\()", - next: "function_arguments", - }, { - token : "punctuation.operator", - regex : /[.](?![.])/, - }, { - token : "support.function", - regex : "/|" + functions + "|/", - }, { - token : "support.function", - regex : /(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/, - }, { - token : "support.function.dom", - regex : /(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName|ClassName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/, - }, { - token : "support.constant", - regex : /(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/, - }, { - token : "identifier", - regex : identifierRe, - }, { - regex: "", - token: "empty", - next: "no_regex", - }, - ], - "start": [ - DocCommentHighlightRules.getStartRule("doc-start"), - comments("start"), - { - token: "string.regexp", - regex: "\\/", - next: "regex", - }, { - token : "text", - regex : "\\s+|^$", - next : "start", - }, { - token: "empty", - regex: "", - next: "no_regex", - }, - ], - "regex": [ - { - token: "regexp.keyword.operator", - regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)", - }, { - token: "string.regexp", - regex: "/[sxngimy]*", - next: "no_regex", - }, { - token : "invalid", - regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/, - }, { - token : "constant.language.escape", - regex: /\(\?[:=!]|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/, - }, { - token : "constant.language.delimiter", - regex: /\|/, - }, { - token: "constant.language.escape", - regex: /\[\^?/, - next: "regex_character_class", - }, { - token: "empty", - regex: "$", - next: "no_regex", - }, { - defaultToken: "string.regexp", - }, - ], - "regex_character_class": [ - { - token: "regexp.charclass.keyword.operator", - regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)", - }, { - token: "constant.language.escape", - regex: "]", - next: "regex", - }, { - token: "constant.language.escape", - regex: "-", - }, { - token: "empty", - regex: "$", - next: "no_regex", - }, { - defaultToken: "string.regexp.charachterclass", - }, - ], - "function_arguments": [ - { - token: "variable.parameter", - regex: identifierRe, - }, { - token: "punctuation.operator", - regex: "[, ]+", - }, { - token: "punctuation.operator", - regex: "$", - }, { - token: "empty", - regex: "", - next: "no_regex", - }, - ], - "qqstring" : [ - { - token : "constant.language.escape", - regex : escapedRe, - }, { - token : "string", - regex : "\\\\$", - next : "qqstring", - }, { - token : "string", - regex : '"|$', - next : "no_regex", - }, { - defaultToken: "string", - }, - ], - "qstring" : [ - { - token : "constant.language.escape", - regex : escapedRe, - }, { - token : "string", - regex : "\\\\$", - next : "qstring", - }, { - token : "string", - regex : "'|$", - next : "no_regex", - }, { - defaultToken: "string", - }, - ], - }; - - - if (!options || !options.noES6) { - this.$rules.no_regex.unshift({ - regex: "[{}]", onMatch: function(val, state, stack) { - this.next = val == "{" ? this.nextState : ""; - if (val == "{" && stack.length) { - stack.unshift("start", state); - } - else if (val == "}" && stack.length) { - stack.shift(); - this.next = stack.shift(); - if (this.next.indexOf("string") != -1 || this.next.indexOf("jsx") != -1) - return "paren.quasi.end"; - } - return val == "{" ? "paren.lparen" : "paren.rparen"; - }, - nextState: "start", - }, { - token : "string.quasi.start", - regex : /`/, - push : [{ - token : "constant.language.escape", - regex : escapedRe, - }, { - token : "paren.quasi.start", - regex : /\${/, - push : "start", - }, { - token : "string.quasi.end", - regex : /`/, - next : "pop", - }, { - defaultToken: "string.quasi", - }], - }); - - if (!options || options.jsx != false) - JSX.call(this); - } - - this.embedRules(DocCommentHighlightRules, "doc-", - [ DocCommentHighlightRules.getEndRule("no_regex") ]); - - this.normalizeRules(); -}; - -oop.inherits(NetscriptHighlightRules, TextHighlightRules); - -function JSX() { - var tagRegex = identifierRe.replace("\\d", "\\d\\-"); - var jsxTag = { - onMatch : function(val, state, stack) { - var offset = val.charAt(1) == "/" ? 2 : 1; - if (offset == 1) { - if (state != this.nextState) - stack.unshift(this.next, this.nextState, 0); - else - stack.unshift(this.next); - stack[2]++; - } else if (offset == 2) { - if (state == this.nextState) { - stack[1]--; - if (!stack[1] || stack[1] < 0) { - stack.shift(); - stack.shift(); - } - } - } - return [{ - type: "meta.tag.punctuation." + (offset == 1 ? "" : "end-") + "tag-open.xml", - value: val.slice(0, offset), - }, { - type: "meta.tag.tag-name.xml", - value: val.substr(offset), - }]; - }, - regex : "", - onMatch : function(value, currentState, stack) { - if (currentState == stack[0]) - stack.shift(); - if (value.length == 2) { - if (stack[0] == this.nextState) - stack[1]--; - if (!stack[1] || stack[1] < 0) { - stack.splice(0, 2); - } - } - this.next = stack[0] || "start"; - return [{type: this.token, value: value}]; - }, - nextState: "jsx", - }, - jsxJsRule, - comments("jsxAttributes"), - { - token : "entity.other.attribute-name.xml", - regex : tagRegex, - }, { - token : "keyword.operator.attribute-equals.xml", - regex : "=", - }, { - token : "text.tag-whitespace.xml", - regex : "\\s+", - }, { - token : "string.attribute-value.xml", - regex : "'", - stateName : "jsx_attr_q", - push : [ - {token : "string.attribute-value.xml", regex: "'", next: "pop"}, - {include : "reference"}, - {defaultToken : "string.attribute-value.xml"}, - ], - }, { - token : "string.attribute-value.xml", - regex : '"', - stateName : "jsx_attr_qq", - push : [ - {token : "string.attribute-value.xml", regex: '"', next: "pop"}, - {include : "reference"}, - {defaultToken : "string.attribute-value.xml"}, - ], - }, - jsxTag, - ]; - this.$rules.reference = [{ - token : "constant.language.escape.reference.xml", - regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)", - }]; -} - -function comments(next) { - return [ - { - token : "comment", // multi line comment - regex : /\/\*/, - next: [ - DocCommentHighlightRules.getTagRule(), - {token : "comment", regex : "\\*\\/", next : next || "pop"}, - {defaultToken : "comment", caseInsensitive: true}, - ], - }, { - token : "comment", - regex : "\\/\\/", - next: [ - DocCommentHighlightRules.getTagRule(), - {token : "comment", regex : "$|^", next : next || "pop"}, - {defaultToken : "comment", caseInsensitive: true}, - ], - }, - ]; -} -exports.NetscriptHighlightRules = NetscriptHighlightRules; -}); - -ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"], function(acequire, exports) { -"use strict"; - -var Range = acequire("../range").Range; - -var MatchingBraceOutdent = function() { - // do nothing. -}; - -(function() { - - this.checkOutdent = function(line, input) { - if (! /^\s+$/.test(line)) - return false; - - return /^\s*\}/.test(input); - }; - - this.autoOutdent = function(doc, row) { - var line = doc.getLine(row); - var match = line.match(/^(\s*\})/); - - if (!match) return 0; - - var column = match[1].length; - var openBracePos = doc.findMatchingBracket({row: row, column: column}); - - if (!openBracePos || openBracePos.row == row) return 0; - - var indent = this.$getIndent(doc.getLine(openBracePos.row)); - doc.replace(new Range(row, 0, row, column-1), indent); - }; - - this.$getIndent = function(line) { - return line.match(/^\s*/)[0]; - }; - -}).call(MatchingBraceOutdent.prototype); - -exports.MatchingBraceOutdent = MatchingBraceOutdent; -}); - -ace.define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(acequire, exports) { -"use strict"; - -var oop = acequire("../../lib/oop"); -var Range = acequire("../../range").Range; -var BaseFoldMode = acequire("./fold_mode").FoldMode; - -var FoldMode = exports.FoldMode = function(commentRegex) { - if (commentRegex) { - this.foldingStartMarker = new RegExp( - this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start), - ); - this.foldingStopMarker = new RegExp( - this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end), - ); - } -}; -oop.inherits(FoldMode, BaseFoldMode); - -(function() { - - this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/; - this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/; - this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/; - this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/; - this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/; - this._getFoldWidgetBase = this.getFoldWidget; - this.getFoldWidget = function(session, foldStyle, row) { - var line = session.getLine(row); - - if (this.singleLineBlockCommentRe.test(line)) { - if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line)) - return ""; - } - - var fw = this._getFoldWidgetBase(session, foldStyle, row); - - if (!fw && this.startRegionRe.test(line)) - return "start"; // lineCommentRegionStart - - return fw; - }; - - this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) { - var line = session.getLine(row); - - if (this.startRegionRe.test(line)) - return this.getCommentRegionBlock(session, line, row); - - var match = line.match(this.foldingStartMarker); - if (match) { - var i = match.index; - - if (match[1]) - return this.openingBracketBlock(session, match[1], row, i); - - var range = session.getCommentFoldRange(row, i + match[0].length, 1); - - if (range && !range.isMultiLine()) { - if (forceMultiline) { - range = this.getSectionRange(session, row); - } else if (foldStyle != "all") - range = null; - } - - return range; - } - - if (foldStyle === "markbegin") - return; - - var match = line.match(this.foldingStopMarker); - if (match) { - var i = match.index + match[0].length; - - if (match[1]) - return this.closingBracketBlock(session, match[1], row, i); - - return session.getCommentFoldRange(row, i, -1); - } - }; - - this.getSectionRange = function(session, row) { - var line = session.getLine(row); - var startIndent = line.search(/\S/); - var startRow = row; - var startColumn = line.length; - row = row + 1; - var endRow = row; - var maxRow = session.getLength(); - while (++row < maxRow) { - line = session.getLine(row); - var indent = line.search(/\S/); - if (indent === -1) - continue; - if (startIndent > indent) - break; - var subRange = this.getFoldWidgetRange(session, "all", row); - - if (subRange) { - if (subRange.start.row <= startRow) { - break; - } else if (subRange.isMultiLine()) { - row = subRange.end.row; - } else if (startIndent == indent) { - break; - } - } - endRow = row; - } - - return new Range(startRow, startColumn, endRow, session.getLine(endRow).length); - }; - this.getCommentRegionBlock = function(session, line, row) { - var startColumn = line.search(/\s*$/); - var maxRow = session.getLength(); - var startRow = row; - - var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/; - var depth = 1; - while (++row < maxRow) { - line = session.getLine(row); - var m = re.exec(line); - if (!m) continue; - if (m[1]) depth--; - else depth++; - - if (!depth) break; - } - - var endRow = row; - if (endRow > startRow) { - return new Range(startRow, startColumn, endRow, line.length); - } - }; - -}).call(FoldMode.prototype); - -}); - -ace.define("ace/mode/netscript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/netscript_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"], function(acequire, exports) { -"use strict"; - -var oop = acequire("../lib/oop"); -var TextMode = acequire("./text").Mode; -var NetscriptHighlightRules = acequire("./netscript_highlight_rules").NetscriptHighlightRules; -var MatchingBraceOutdent = acequire("./matching_brace_outdent").MatchingBraceOutdent; -var WorkerClient = acequire("../worker/worker_client").WorkerClient; -var CstyleBehaviour = acequire("./behaviour/cstyle").CstyleBehaviour; -var CStyleFoldMode = acequire("./folding/cstyle").FoldMode; - -var Mode = function() { - this.HighlightRules = NetscriptHighlightRules; - - this.$outdent = new MatchingBraceOutdent(); - this.$behaviour = new CstyleBehaviour(); - this.foldingRules = new CStyleFoldMode(); -}; -oop.inherits(Mode, TextMode); - -(function() { - - this.lineCommentStart = "//"; - this.blockComment = {start: "/*", end: "*/"}; - - this.getNextLineIndent = function(state, line, tab) { - var indent = this.$getIndent(line); - - var tokenizedLine = this.getTokenizer().getLineTokens(line, state); - var tokens = tokenizedLine.tokens; - var endState = tokenizedLine.state; - - if (tokens.length && tokens[tokens.length-1].type == "comment") { - return indent; - } - - if (state == "start" || state == "no_regex") { - var match = line.match(/^.*(?:\bcase\b.*:|[\{\(\[])\s*$/); - if (match) { - indent += tab; - } - } else if (state == "doc-start") { - if (endState == "start" || endState == "no_regex") { - return ""; - } - var match = line.match(/^\s*(\/?)\*/); - if (match) { - if (match[1]) { - indent += " "; - } - indent += "* "; - } - } - - return indent; - }; - - this.checkOutdent = function(state, line, input) { - return this.$outdent.checkOutdent(line, input); - }; - - this.autoOutdent = function(state, doc, row) { - this.$outdent.autoOutdent(doc, row); - }; - - this.createWorker = function(session) { - var worker = new WorkerClient(["ace"], require("brace/worker/javascript"), "JavaScriptWorker"); - worker.attachToDocument(session.getDocument()); - - worker.on("annotate", function(results) { - session.setAnnotations(results.data); - }); - - worker.on("terminate", function() { - session.clearAnnotations(); - }); - - return worker; - }; - - this.$id = "ace/mode/netscript"; -}).call(Mode.prototype); - -exports.Mode = Mode; -}); diff --git a/src/ScriptEditor/CodeMirror.js b/src/ScriptEditor/CodeMirror.js deleted file mode 100644 index 4093fdf69..000000000 --- a/src/ScriptEditor/CodeMirror.js +++ /dev/null @@ -1,596 +0,0 @@ -// Wrapper for CodeMirror editor -// https://github.com/codemirror/codemirror -import { ScriptEditor } from "./ScriptEditor"; - -import 'codemirror/lib/codemirror.css'; - -import 'codemirror/theme/monokai.css'; -import 'codemirror/theme/3024-day.css'; -import 'codemirror/theme/3024-night.css'; -import 'codemirror/theme/abcdef.css'; -import 'codemirror/theme/ambiance-mobile.css'; -import 'codemirror/theme/ambiance.css'; -import 'codemirror/theme/base16-dark.css'; -import 'codemirror/theme/base16-light.css'; -import 'codemirror/theme/bespin.css'; -import 'codemirror/theme/blackboard.css'; -import 'codemirror/theme/cobalt.css'; -import 'codemirror/theme/colorforth.css'; -import 'codemirror/theme/darcula.css'; -import 'codemirror/theme/dracula.css'; -import 'codemirror/theme/duotone-dark.css'; -import 'codemirror/theme/duotone-light.css'; -import 'codemirror/theme/eclipse.css'; -import 'codemirror/theme/elegant.css'; -import 'codemirror/theme/erlang-dark.css'; -import 'codemirror/theme/gruvbox-dark.css'; -import 'codemirror/theme/hopscotch.css'; -import 'codemirror/theme/icecoder.css'; -import 'codemirror/theme/idea.css'; -import 'codemirror/theme/isotope.css'; -import 'codemirror/theme/lesser-dark.css'; -import 'codemirror/theme/liquibyte.css'; -import 'codemirror/theme/lucario.css'; -import 'codemirror/theme/material.css'; -import 'codemirror/theme/mbo.css'; -import 'codemirror/theme/mdn-like.css'; -import 'codemirror/theme/midnight.css'; -import 'codemirror/theme/neat.css'; -import 'codemirror/theme/neo.css'; -import 'codemirror/theme/night.css'; -import 'codemirror/theme/oceanic-next.css'; -import 'codemirror/theme/panda-syntax.css'; -import 'codemirror/theme/paraiso-dark.css'; -import 'codemirror/theme/paraiso-light.css'; -import 'codemirror/theme/pastel-on-dark.css'; -import 'codemirror/theme/railscasts.css'; -import 'codemirror/theme/rubyblue.css'; -import 'codemirror/theme/seti.css'; -import 'codemirror/theme/shadowfox.css'; -import 'codemirror/theme/solarized.css'; -import 'codemirror/theme/ssms.css'; -import 'codemirror/theme/the-matrix.css'; -import 'codemirror/theme/tomorrow-night-bright.css'; -import 'codemirror/theme/tomorrow-night-eighties.css'; -import 'codemirror/theme/ttcn.css'; -import 'codemirror/theme/twilight.css'; -import 'codemirror/theme/vibrant-ink.css'; -import 'codemirror/theme/xq-dark.css'; -import 'codemirror/theme/xq-light.css'; -import 'codemirror/theme/yeti.css'; -import 'codemirror/theme/zenburn.css'; - -import CodeMirror from "codemirror/lib/codemirror.js"; -import "codemirror/mode/javascript/javascript.js"; -import "./CodeMirrorNetscriptMode"; - -import 'codemirror/keymap/sublime.js'; -import 'codemirror/keymap/vim.js'; -import 'codemirror/keymap/emacs.js'; - -import 'codemirror/addon/comment/continuecomment.js'; -import 'codemirror/addon/dialog/dialog.css'; -import 'codemirror/addon/dialog/dialog.js'; -import 'codemirror/addon/edit/closebrackets.js'; -import 'codemirror/addon/edit/matchbrackets.js'; -import 'codemirror/addon/fold/foldcode.js'; -import 'codemirror/addon/fold/foldgutter.js'; -import 'codemirror/addon/fold/foldgutter.css'; -import 'codemirror/addon/fold/brace-fold.js'; -import 'codemirror/addon/fold/indent-fold.js'; -import 'codemirror/addon/fold/comment-fold.js'; -import 'codemirror/addon/hint/javascript-hint.js'; -import 'codemirror/addon/hint/show-hint.js'; -import 'codemirror/addon/hint/show-hint.css'; -import 'codemirror/addon/lint/lint.js'; -import 'codemirror/addon/lint/lint.css'; -import 'codemirror/addon/search/match-highlighter.js'; -import 'codemirror/addon/selection/active-line.js'; - -import { JSHINT } from 'jshint'; -import './CodeMirrorNetscriptLint.js'; - -import { NetscriptFunctions } from "../NetscriptFunctions"; -import { CodeMirrorKeybindingSetting, - CodeMirrorThemeSetting } from "../Settings/SettingEnums"; -import { Settings } from "../Settings/Settings"; - -import { clearEventListeners } from "../../utils/uiHelpers/clearEventListeners"; -import { createElement } from "../../utils/uiHelpers/createElement"; -import { createOptionElement } from "../../utils/uiHelpers/createOptionElement"; -import { removeChildrenFromElement } from "../../utils/uiHelpers/removeChildrenFromElement"; - -(function() { - window.JSHINT = JSHINT; -})(); - -// Max number of invisibles to be shown in a group if the "Show Invisibles" option -// is marked -const MaxInvisibles = 20; - -function validateInitializationParamters(params) { - if (params.saveAndCloseFn == null) { return false; } // Save & close button function - if (params.quitFn == null) { return false; } // Quitting editor, aka Engine.loadTerminalContent - - return true; -} - -class CodeMirrorEditorWrapper extends ScriptEditor { - constructor() { - super(); - this.vimCommandDisplay = null; - this.vimCommandDisplayWrapper = null; - this.tabsStyleElement = null; - } - - init(params) { - if (this.editor != null) { - console.error(`CodeMirrorEditor.init() called when it's already initialized`); - return false; - } - - // Validate/Sanitize input - if (!validateInitializationParamters(params)) { - console.error(`'params' argument passed into CodeMirrorEditor.init() does not have proper properties`); - return false; - } - - // Store the filename input - this.filenameInput = document.getElementById("script-editor-filename"); - if (this.filenameInput == null) { - console.error(`Could not get Script Editor filename element (id=script-editor-filename)`); - return false; - } - - // Add styling for the "Show Invisibles" option for spaces - const classBase = '.CodeMirror .cm-whitespace-'; - const spaceChar = 'ยท'; - const style = document.createElement('style'); - - style.setAttribute('data-name', 'js-show-invisibles'); - - let rules = ''; - let spaceChars = ''; - - for (let i = 1; i <= MaxInvisibles; ++i) { - spaceChars += spaceChar; - - const rule = classBase + i + '::before { content: "' + spaceChars + '";}\n'; - rules += rule; - } - - style.textContent = rules; - document.head.appendChild(style); - - // Add an element for the "Show Invisible" option for tabs - this.tabsStyleElement = document.createElement('style'); - document.head.appendChild(this.tabsStyleElement); - - // Store a reference to the VIM command display - this.vimCommandDisplay = document.getElementById("codemirror-vim-command-display"); - this.vimCommandDisplayWrapper = document.getElementById("codemirror-vim-command-display-wrapper"); - - // Define a "Save" command for CodeMirror so shortcuts like Ctrl + s - // will save in-game - CodeMirror.commands.save = function() { params.saveAndCloseFn(); } - - // Add Netscript Functions to the autocompleter - const netscriptFns = []; - var fnsObj = NetscriptFunctions(null); - for (let name in fnsObj) { - if (fnsObj.hasOwnProperty(name)) { - netscriptFns.push(name); - - //Get functions from namespaces - const namespaces = ["bladeburner", "hacknet", "codingcontract", "gang", "sleeve", "heart", "formulas"]; - if (namespaces.includes(name)) { - let namespace = fnsObj[name]; - if (typeof namespace !== "object") {continue;} - let namespaceFns = Object.keys(namespace); - for (let i = 0; i < namespaceFns.length; ++i) { - netscriptFns.push(namespaceFns[i]); - } - } - } - } - - CodeMirror.hint.netscript = function(editor) { - const origList = CodeMirror.hint.javascript(editor) || {from: editor.getCursor(), to: editor.getCursor(), list: []}; - origList.list.push(...netscriptFns); - let list = origList.list || []; - let cursor = editor.getCursor(); - let currentLine = editor.getLine(cursor.line); - let start = cursor.ch; - let end = start; - while (end < currentLine.length && /[\w$]+/.test(currentLine.charAt(end))) ++end; - while (start && /[\w$]+/.test(currentLine.charAt(start - 1))) --start; - let curWord = start != end && currentLine.slice(start, end); - let regex = new RegExp('^' + curWord, 'i'); - let result = { - list: (!curWord ? list : list.filter(function (item) { - return item.match(regex); - })).sort(), - from: CodeMirror.Pos(cursor.line, start), - to: CodeMirror.Pos(cursor.line, end), - }; - - return result; - }; - - // Configure VIM keybindings - var VimApi = CodeMirror.Vim; - VimApi.defineEx('write', 'w', function() { - params.saveAndCloseFn(); - }); - VimApi.defineEx('quit', 'q', function() { - params.quitFn(); - }); - VimApi.defineEx('xwritequit', 'x', function() { - params.saveAndCloseFn(); - }); - VimApi.defineEx('wqwritequit', 'wq', function() { - params.saveAndCloseFn(); - }); - } - - initialized() { - return (this.filenameInput != null); - } - - create() { - function safeGetElementById(id, whatFor="") { - const elem = document.getElementById(id); - if (elem == null) { - throw new Error(`Could not find ${whatFor} DOM element(id=${id})`); - } - - return elem; - } - - function safeClearEventListeners(id, whatFor="") { - const elem = clearEventListeners(id); - if (elem == null) { - throw new Error(`Could not find ${whatFor} DOM element(id=${id})`); - } - - return elem; - } - - try { - if (!this.initialized()) { - console.warn(`CodeMirrorEditor.create() called when editor was not initialized`); - return; - } - - // Get and sanitize the keybinding (keymap) setting - if (!(Object.values(CodeMirrorKeybindingSetting).includes(Settings.EditorKeybinding))) { - Settings.EditorKeybinding = CodeMirrorKeybindingSetting.Default; - } - - // Initialize CodeMirror Editor - const textAreaElement = safeGetElementById("codemirror-editor", "CodeMirror Textarea"); - const formElement = safeGetElementById("codemirror-form-wrapper", "CodeMirror Form Wrapper"); - formElement.style.display = "block"; - - this.editor = CodeMirror.fromTextArea(textAreaElement, { - autofocus: true, - extraKeys: { "Ctrl-Space": "autocomplete" }, - foldGutter: true, - gutters: ["CodeMirror-lint-markers", "CodeMirror-linenumbers", "CodeMirror-foldgutter"], - highlightSelectionMatches: true, - hintOptions: { hint: CodeMirror.hint.netscript }, - indentUnit: 4, - keyMap: "default", - lineNumbers: true, - matchBrackets: true, - maxInvisibles: 32, - mode: "netscript", - theme: Settings.EditorTheme, - }); - - // Setup Theme Option - const themeDropdown = safeClearEventListeners("script-editor-option-theme", "Theme Selector"); - removeChildrenFromElement(themeDropdown); - const themeOptions = Object.keys(CodeMirrorThemeSetting); - for (let i = 0; i < themeOptions.length; ++i) { - const themeKey = themeOptions[i]; - const themeValue = CodeMirrorThemeSetting[themeKey]; - themeDropdown.add(createOptionElement(themeKey, themeValue)); - } - if (Settings.EditorTheme) { - var initialIndex = 0; - for (var i = 0; i < themeDropdown.options.length; ++i) { - if (themeDropdown.options[i].value === Settings.EditorTheme) { - initialIndex = i; - break; - } - } - themeDropdown.selectedIndex = initialIndex; - } else { - themeDropdown.selectedIndex = 0; - } - - themeDropdown.onchange = () => { - const val = themeDropdown.value; - Settings.EditorTheme = val; - this.editor.setOption("theme", val); - }; - themeDropdown.onchange(); - - // Setup Keymap Option - const keybindingDropdown = safeClearEventListeners("script-editor-option-keybinding", "Keymap Selector"); - if (keybindingDropdown == null) { - console.error(`Could not find Script Editor's keybinding selector element (id="script-editor-option-keybinding")`); - return false; - } - removeChildrenFromElement(keybindingDropdown); - keybindingDropdown.add(createOptionElement("Default", CodeMirrorKeybindingSetting.Default)); - keybindingDropdown.add(createOptionElement("Sublime", CodeMirrorKeybindingSetting.Sublime)); - keybindingDropdown.add(createOptionElement("Vim", CodeMirrorKeybindingSetting.Vim)); - keybindingDropdown.add(createOptionElement("Emacs", CodeMirrorKeybindingSetting.Emacs)); - if (Settings.EditorKeybinding) { - var initialIndex = 0; - for (var i = 0; i < keybindingDropdown.options.length; ++i) { - if (keybindingDropdown.options[i].value === Settings.EditorKeybinding) { - initialIndex = i; - break; - } - } - keybindingDropdown.selectedIndex = initialIndex; - } else { - keybindingDropdown.selectedIndex = 0; - } - keybindingDropdown.onchange = () => { - // Set Vim command display to be invisible initially - this.vimCommandDisplayWrapper.style.display = "none"; - - const val = keybindingDropdown.value; - Settings.EditorKeybinding = val; - this.editor.removeKeyMap(CodeMirror.keyMap.default); - this.editor.removeKeyMap(CodeMirror.keyMap.sublime); - this.editor.removeKeyMap(CodeMirror.keyMap.emacs); - this.editor.removeKeyMap(CodeMirror.keyMap.vim); - - // Setup the VIM command display - let keys = ''; - const handleVimKeyPress = (key) => { - keys = keys + key; - this.vimCommandDisplay.innerHTML = keys; - } - const handleVimCommandDone = () => { - keys = ''; - this.vimCommandDisplay.innerHTML = keys; - } - if (val === CodeMirrorKeybindingSetting.Vim) { - this.vimCommandDisplayWrapper.style.display = "block"; - this.editor.on('vim-keypress', handleVimKeyPress); - this.editor.on('vim-command-done', handleVimCommandDone); - - } else { - this.vimCommandDisplayWrapper.style.display = "none"; - this.editor.off('vim-keypress', handleVimKeyPress); - this.editor.off('vim-command-done', handleVimCommandDone); - } - - this.editor.addKeyMap(val); - this.editor.setOption("keyMap", val); - }; - keybindingDropdown.onchange(); - - // Highlight Active line - const highlightActiveChkBox = safeClearEventListeners("script-editor-option-highlightactiveline", "Active Line Checkbox"); - highlightActiveChkBox.checked = Settings.EditorHighlightActiveLine; - highlightActiveChkBox.onchange = () => { - Settings.EditorHighlightActiveLine = highlightActiveChkBox.checked; - this.editor.setOption("styleActiveLine", highlightActiveChkBox.checked); - }; - highlightActiveChkBox.onchange(); - - // Show Invisibles - const showInvisiblesChkBox = safeClearEventListeners("script-editor-option-showinvisibles", "Show Invisible Checkbox"); - showInvisiblesChkBox.checked = Settings.EditorShowInvisibles; - showInvisiblesChkBox.onchange = () => { - Settings.EditorShowInvisibles = showInvisiblesChkBox.checked; - const overlayMode = { - name: 'invisibles', - token: function(stream) { - var ret, - spaces = 0, - space = stream.peek() === ' '; - - if (space) { - while (space && spaces < MaxInvisibles) { - ++spaces; - - stream.next(); - space = stream.peek() === ' '; - } - - ret = 'whitespace whitespace-' + spaces; - } else { - while (!stream.eol() && !space) { - stream.next(); - - space = stream.peek() === ' '; - } - - ret = 'cm-eol'; - } - - return ret; - }, - }; - - if (showInvisiblesChkBox.checked) { - // Spaces - this.editor.addOverlay(overlayMode); - - // Tabs - this.tabsStyleElement.innerHTML = ".cm-tab {background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABDSURBVEhLYxgFo2BkAGYH/9r/QFoAxIGyhx6AORzZA4xD1TcHNjYzQplDB2CLgaECYHkADIZqqgGBoZdsRsHgBgwMAB8iFHF42AERAAAAAElFTkSuQmCC);background-position: right;background-repeat: no-repeat;}"; - } else { - this.editor.removeOverlay("invisibles"); - this.tabsStyleElement.innerHTML = ""; - } - }; - showInvisiblesChkBox.onchange(); - - //Use Soft Tab - const softTabChkBox = safeClearEventListeners("script-editor-option-usesofttab", "Soft Tab Checkbox"); - softTabChkBox.checked = Settings.EditorUseSoftTab; - softTabChkBox.onchange = () => { - Settings.EditorUseSoftTab = softTabChkBox.checked; - this.editor.setOption("indentWithTabs", !softTabChkBox.checked); - if (softTabChkBox.checked) { - this.editor.addKeyMap({ - name: "soft-tabs-keymap", - "Tab": function (cm) { - if (cm.somethingSelected()) { - var sel = cm.getSelection("\n"); - // Indent only if there are multiple lines selected, or if the selection spans a full line - if (sel.length > 0 && (sel.indexOf("\n") > -1 || sel.length === cm.getLine(cm.getCursor().line).length)) { - cm.indentSelection("add"); - return; - } - } - - if (cm.options.indentWithTabs) - cm.execCommand("insertTab"); - else - cm.execCommand("insertSoftTab"); - }, - "Shift-Tab": function (cm) { - cm.indentSelection("subtract"); - }, - }); - } else { - this.editor.removeKeyMap("soft-tabs-keymap"); - } - }; - softTabChkBox.onchange(); - - // Some helper functions for dealing with flexible options - function resetFlexibleOption(id) { - const fieldset = safeGetElementById(id); - removeChildrenFromElement(fieldset); - fieldset.style.display = "block"; - return fieldset; - } - - function removeFlexibleOption(id) { - // This doesn't really remove it, just sets it to invisible - const fieldset = resetFlexibleOption(id); - fieldset.style.display = "none"; - return fieldset; - } - - // Flex 1: Automatically Close Brackets and Quotes - const flex1Fieldset = resetFlexibleOption("script-editor-option-flex1-fieldset"); - const flex1Id = "script-editor-option-flex1"; - flex1Fieldset.appendChild(createElement("label", { - for: flex1Id, - innerText: "Auto-Close Brackets/Quotes", - })); - - const flex1Checkbox = createElement("input", { - checked: Settings.EditorAutoCloseBrackets, - id: flex1Id, - name: flex1Id, - type: "checkbox", - }); - flex1Fieldset.appendChild(flex1Checkbox); - flex1Checkbox.onchange = () => { - Settings.EditorAutoCloseBrackets = flex1Checkbox.checked; - this.editor.setOption("autoCloseBrackets", flex1Checkbox.checked); - }; - flex1Checkbox.onchange(); - - // Flex 2: Disable/Enable Linting - const flex2Fieldset = resetFlexibleOption("script-editor-option-flex2-fieldset"); - const flex2Id = "script-editor-option-flex2"; - flex2Fieldset.appendChild(createElement("label", { - for: flex2Id, - innerText: "Enable Linting", - })); - - const flex2Checkbox = createElement("input", { - checked: Settings.EditorEnableLinting, - id: flex2Id, - name: flex2Id, - type: "checkbox", - }); - flex2Fieldset.appendChild(flex2Checkbox); - flex2Checkbox.onchange = () => { - if (flex2Checkbox.checked) { - Settings.EditorEnableLinting = true; - this.editor.setOption("lint", CodeMirror.lint.netscript); - } else { - Settings.EditorEnableLinting = false; - this.editor.setOption("lint", false); - } - } - flex2Checkbox.onchange(); - - // Flex 3: Continue Comments - const flex3Fieldset = resetFlexibleOption("script-editor-option-flex3-fieldset"); - const flex3Id = "script-editor-option-flex3"; - flex3Fieldset.appendChild(createElement("label", { - for: flex3Id, - innerText: "Continue Comments", - })); - - const flex3Checkbox = createElement("input", { - checked: Settings.EditorContinueComments, - id: flex3Id, - name: flex3Id, - type: "checkbox", - }); - flex3Fieldset.appendChild(flex3Checkbox); - flex3Checkbox.onchange = () => { - Settings.EditorContinueComments = flex3Checkbox.checked; - this.editor.setOption("continueComments", flex3Checkbox.checked); - } - flex3Checkbox.onchange(); - - removeFlexibleOption("script-editor-option-flex4-fieldset"); - - this.editor.refresh(); - } catch(e) { - console.error(`Exception caught: ${e}. ${e.stack}`); - return false; - } - } - - isFocused() { - if (this.editor == null) { return false; } - return this.editor.hasFocus(); - } - - // Sets the editor to be invisible - setInvisible() { - if (!this.initialized()) { - console.warn(`CodeMirrorEditor.setInvisible() called when editor was not initialized`); - return; - } - - if (this.editor != null) { - this.editor.toTextArea(); - this.editor = null; - } - - const elem = document.getElementById("codemirror-form-wrapper"); - if (elem instanceof HTMLElement) { - elem.style.display = "none"; - } - } - - getCursor() { - const c = this.editor.getCursor(); //I need to get the cursor position - return {row: c.line, column: c.ch}; - } - - setCursor(pos) { - this.editor.setCursor({line: pos.row, ch: pos.column}); - } -} - -export const CodeMirrorEditor = new CodeMirrorEditorWrapper(); diff --git a/src/ScriptEditor/CodeMirrorNetscriptLint.js b/src/ScriptEditor/CodeMirrorNetscriptLint.js deleted file mode 100644 index c0a2a776f..000000000 --- a/src/ScriptEditor/CodeMirrorNetscriptLint.js +++ /dev/null @@ -1,83 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: https://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("codemirror/lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["codemirror/lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - // declare global: JSHINT - - function validator(text, options) { - if (!window.JSHINT) { - if (window.console) { - window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run."); - } - return []; - } - - // To ignore the 'async/await' errors, we'll manually edit the code ('text') - // that gets processed by JSHINT to include the ignore directory - const splitText = text.split("\n"); - const ignoreDirective = " // jshint ignore:line"; - for (let i = 0; i < splitText.length; ++i) { - if (splitText[i].match(/.*async function.+{/g)) { - splitText[i] += ignoreDirective; - } else if (splitText[i].match(/.*await.+;/g)) { - splitText[i] += ignoreDirective; - } - } - const sanitizedText = splitText.join("\n"); - - // Configure JSHINT options - if (!options.indent) // JSHint error.character actually is a column index, this fixes underlining on lines using tabs for indentation - options.indent = 1; // JSHint default value is 4 - - options.esversion = 9; - - JSHINT(sanitizedText, options, options.globals); - var errors = JSHINT.data().errors, result = []; - if (errors) parseErrors(errors, result); - return result; - } - - CodeMirror.registerHelper("lint", "netscript", validator); - - function parseErrors(errors, output) { - for ( var i = 0; i < errors.length; i++) { - var error = errors[i]; - if (error) { - if (error.line == 0) { continue; } - if (error.line < 0) { - if (window.console) { - window.console.warn("Cannot display JSHint error (invalid line " + error.line + ")", error); - } - continue; - } - - var start = error.character - 1, end = start + 1; - if (error.evidence) { - var index = error.evidence.substring(start).search(/.\b/); - if (index > -1) { - end += index; - } - } - - // Convert to format expected by validation service - var hint = { - message: error.reason, - severity: error.code ? (error.code.startsWith('W') ? "warning" : "error") : "error", - from: CodeMirror.Pos(error.line - 1, start), - to: CodeMirror.Pos(error.line - 1, end), - }; - - output.push(hint); - } - } - } -}); diff --git a/src/ScriptEditor/CodeMirrorNetscriptMode.js b/src/ScriptEditor/CodeMirrorNetscriptMode.js deleted file mode 100644 index 7ffb2b14c..000000000 --- a/src/ScriptEditor/CodeMirrorNetscriptMode.js +++ /dev/null @@ -1,939 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: https://codemirror.net/LICENSE -import CodeMirror from "codemirror/lib/codemirror.js"; -import { NetscriptFunctions } from "../NetscriptFunctions"; - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("codemirror/lib/codemirror.js")); - else if (typeof define == "function" && define.amd) // AMD - define(["codemirror/lib/codemirror.js"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("netscript", function(config, parserConfig) { - var indentUnit = config.indentUnit; - var statementIndent = parserConfig.statementIndent; - var jsonldMode = parserConfig.jsonld; - var jsonMode = parserConfig.json || jsonldMode; - var isTS = parserConfig.typescript; - var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/; - - // Tokenizer - - var keywords = (function(){ - function kw(type) {return {type: type, style: "keyword"};} - var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"), D = kw("keyword d"); - var operator = kw("operator"), atom = {type: "atom", style: "atom"}; - - const ret = { - "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B, - "return": D, "break": D, "continue": D, "new": kw("new"), "delete": C, "void": C, "throw": C, - "debugger": kw("debugger"), "var": kw("var"), "const": kw("var"), "let": kw("var"), - "function": kw("function"), "catch": kw("catch"), - "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"), - "in": operator, "typeof": operator, "instanceof": operator, - "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom, - "this": kw("this"), "class": kw("class"), "super": kw("atom"), - "yield": C, "export": kw("export"), "import": kw("import"), "extends": C, - "await": C, - - // Netscript Basic Functions - "hack": atom, - }; - - function push(obj) { - for(const key of Object.keys(obj)) { - if(typeof obj[key] === 'function') ret[key] = atom; - if(typeof obj[key] === 'object') push(obj[key]); - } - } - push(NetscriptFunctions(null)); - return ret; - }()); - - var isOperatorChar = /[+\-*&%=<>!?|~^@]/; - var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/; - - function readRegexp(stream) { - var escaped = false, next, inSet = false; - while ((next = stream.next()) != null) { - if (!escaped) { - if (next == "/" && !inSet) return; - if (next == "[") inSet = true; - else if (inSet && next == "]") inSet = false; - } - escaped = !escaped && next == "\\"; - } - } - - // Used as scratch variables to communicate multiple values without - // consing up tons of objects. - var type, content; - function ret(tp, style, cont) { - type = tp; content = cont; - return style; - } - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"' || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) { - return ret("number", "number"); - } else if (ch == "." && stream.match("..")) { - return ret("spread", "meta"); - } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - return ret(ch); - } else if (ch == "=" && stream.eat(">")) { - return ret("=>", "operator"); - } else if (ch == "0" && stream.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/i)) { - return ret("number", "number"); - } else if (/\d/.test(ch)) { - stream.match(/^\d*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/); - return ret("number", "number"); - } else if (ch == "/") { - if (stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } else if (stream.eat("/")) { - stream.skipToEnd(); - return ret("comment", "comment"); - } else if (expressionAllowed(stream, state, 1)) { - readRegexp(stream); - stream.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/); - return ret("regexp", "string-2"); - } else { - stream.eat("="); - return ret("operator", "operator", stream.current()); - } - } else if (ch == "`") { - state.tokenize = tokenQuasi; - return tokenQuasi(stream, state); - } else if (ch == "#") { - stream.skipToEnd(); - return ret("error", "error"); - } else if (isOperatorChar.test(ch)) { - if (ch != ">" || !state.lexical || state.lexical.type != ">") { - if (stream.eat("=")) { - if (ch == "!" || ch == "=") stream.eat("=") - } else if (/[<>*+\-]/.test(ch)) { - stream.eat(ch) - if (ch == ">") stream.eat(ch) - } - } - return ret("operator", "operator", stream.current()); - } else if (wordRE.test(ch)) { - stream.eatWhile(wordRE); - var word = stream.current() - if (state.lastType != ".") { - if (keywords.propertyIsEnumerable(word)) { - var kw = keywords[word] - return ret(kw.type, kw.style, word) - } - if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false)) - return ret("async", "keyword", word) - } - return ret("variable", "variable", word) - } - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next; - if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){ - state.tokenize = tokenBase; - return ret("jsonld-keyword", "meta"); - } - while ((next = stream.next()) != null) { - if (next == quote && !escaped) break; - escaped = !escaped && next == "\\"; - } - if (!escaped) state.tokenize = tokenBase; - return ret("string", "string"); - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return ret("comment", "comment"); - } - - function tokenQuasi(stream, state) { - var escaped = false, next; - while ((next = stream.next()) != null) { - if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) { - state.tokenize = tokenBase; - break; - } - escaped = !escaped && next == "\\"; - } - return ret("quasi", "string-2", stream.current()); - } - - var brackets = "([{}])"; - // This is a crude lookahead trick to try and notice that we're - // parsing the argument patterns for a fat-arrow function before we - // actually hit the arrow token. It only works if the arrow is on - // the same line as the arguments and there's no strange noise - // (comments) in between. Fallback is to only notice when we hit the - // arrow, and not declare the arguments as locals for the arrow - // body. - function findFatArrow(stream, state) { - if (state.fatArrowAt) state.fatArrowAt = null; - var arrow = stream.string.indexOf("=>", stream.start); - if (arrow < 0) return; - - if (isTS) { // Try to skip TypeScript return type declarations after the arguments - var m = /:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(stream.string.slice(stream.start, arrow)) - if (m) arrow = m.index - } - - var depth = 0, sawSomething = false; - for (var pos = arrow - 1; pos >= 0; --pos) { - var ch = stream.string.charAt(pos); - var bracket = brackets.indexOf(ch); - if (bracket >= 0 && bracket < 3) { - if (!depth) { ++pos; break; } - if (--depth == 0) { if (ch == "(") sawSomething = true; break; } - } else if (bracket >= 3 && bracket < 6) { - ++depth; - } else if (wordRE.test(ch)) { - sawSomething = true; - } else if (/["'\/]/.test(ch)) { - return; - } else if (sawSomething && !depth) { - ++pos; - break; - } - } - if (sawSomething && !depth) state.fatArrowAt = pos; - } - - // Parser - - var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true}; - - function JSLexical(indented, column, type, align, prev, info) { - this.indented = indented; - this.column = column; - this.type = type; - this.prev = prev; - this.info = info; - if (align != null) this.align = align; - } - - function inScope(state, varname) { - for (var v = state.localVars; v; v = v.next) - if (v.name == varname) return true; - for (var cx = state.context; cx; cx = cx.prev) { - for (var v = cx.vars; v; v = v.next) - if (v.name == varname) return true; - } - } - - function parseJS(state, style, type, content, stream) { - var cc = state.cc; - // Communicate our context to the combinators. - // (Less wasteful than consing up a hundred closures on every call.) - cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style; - - if (!state.lexical.hasOwnProperty("align")) - state.lexical.align = true; - - while(true) { - var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement; - if (combinator(type, content)) { - while(cc.length && cc[cc.length - 1].lex) - cc.pop()(); - if (cx.marked) return cx.marked; - if (type == "variable" && inScope(state, content)) return "variable-2"; - return style; - } - } - } - - // Combinator utils - - var cx = {state: null, column: null, marked: null, cc: null}; - function pass() { - for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]); - } - function cont() { - pass.apply(null, arguments); - return true; - } - function inList(name, list) { - for (var v = list; v; v = v.next) if (v.name == name) return true - return false; - } - function register(varname) { - var state = cx.state; - cx.marked = "def"; - if (state.context) { - if (state.lexical.info == "var" && state.context && state.context.block) { - // FIXME function decls are also not block scoped - var newContext = registerVarScoped(varname, state.context) - if (newContext != null) { - state.context = newContext - return - } - } else if (!inList(varname, state.localVars)) { - state.localVars = new Var(varname, state.localVars) - return - } - } - // Fall through means this is global - if (parserConfig.globalVars && !inList(varname, state.globalVars)) - state.globalVars = new Var(varname, state.globalVars) - } - function registerVarScoped(varname, context) { - if (!context) { - return null - } else if (context.block) { - var inner = registerVarScoped(varname, context.prev) - if (!inner) return null - if (inner == context.prev) return context - return new Context(inner, context.vars, true) - } else if (inList(varname, context.vars)) { - return context - } else { - return new Context(context.prev, new Var(varname, context.vars), false) - } - } - - function isModifier(name) { - return name == "public" || name == "private" || name == "protected" || name == "abstract" || name == "readonly" - } - - // Combinators - - function Context(prev, vars, block) { this.prev = prev; this.vars = vars; this.block = block } - function Var(name, next) { this.name = name; this.next = next } - - var defaultVars = new Var("this", new Var("arguments", null)) - function pushcontext() { - cx.state.context = new Context(cx.state.context, cx.state.localVars, false) - cx.state.localVars = defaultVars - } - function pushblockcontext() { - cx.state.context = new Context(cx.state.context, cx.state.localVars, true) - cx.state.localVars = null - } - function popcontext() { - cx.state.localVars = cx.state.context.vars - cx.state.context = cx.state.context.prev - } - popcontext.lex = true - function pushlex(type, info) { - var result = function() { - var state = cx.state, indent = state.indented; - if (state.lexical.type == "stat") indent = state.lexical.indented; - else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev) - indent = outer.indented; - state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info); - }; - result.lex = true; - return result; - } - function poplex() { - var state = cx.state; - if (state.lexical.prev) { - if (state.lexical.type == ")") - state.indented = state.lexical.indented; - state.lexical = state.lexical.prev; - } - } - poplex.lex = true; - - function expect(wanted) { - function exp(type) { - if (type == wanted) return cont(); - else if (wanted == ";" || type == "}" || type == ")" || type == "]") return pass(); - else return cont(exp); - } - return exp; - } - - function statement(type, value) { - if (type == "var") return cont(pushlex("vardef", value), vardef, expect(";"), poplex); - if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex); - if (type == "keyword b") return cont(pushlex("form"), statement, poplex); - if (type == "keyword d") return cx.stream.match(/^\s*$/, false) ? cont() : cont(pushlex("stat"), maybeexpression, expect(";"), poplex); - if (type == "debugger") return cont(expect(";")); - if (type == "{") return cont(pushlex("}"), pushblockcontext, block, poplex, popcontext); - if (type == ";") return cont(); - if (type == "if") { - if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex) - cx.state.cc.pop()(); - return cont(pushlex("form"), parenExpr, statement, poplex, maybeelse); - } - if (type == "function") return cont(functiondef); - if (type == "for") return cont(pushlex("form"), forspec, statement, poplex); - if (type == "class" || (isTS && value == "interface")) { - cx.marked = "keyword" - return cont(pushlex("form", type == "class" ? type : value), className, poplex) - } - if (type == "variable") { - if (isTS && value == "declare") { - cx.marked = "keyword" - return cont(statement) - } else if (isTS && (value == "module" || value == "enum" || value == "type") && cx.stream.match(/^\s*\w/, false)) { - cx.marked = "keyword" - if (value == "enum") return cont(enumdef); - else if (value == "type") return cont(typename, expect("operator"), typeexpr, expect(";")); - else return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex) - } else if (isTS && value == "namespace") { - cx.marked = "keyword" - return cont(pushlex("form"), expression, statement, poplex) - } else if (isTS && value == "abstract") { - cx.marked = "keyword" - return cont(statement) - } else { - return cont(pushlex("stat"), maybelabel); - } - } - if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"), pushblockcontext, - block, poplex, poplex, popcontext); - if (type == "case") return cont(expression, expect(":")); - if (type == "default") return cont(expect(":")); - if (type == "catch") return cont(pushlex("form"), pushcontext, maybeCatchBinding, statement, poplex, popcontext); - if (type == "export") return cont(pushlex("stat"), afterExport, poplex); - if (type == "import") return cont(pushlex("stat"), afterImport, poplex); - if (type == "async") return cont(statement) - if (value == "@") return cont(expression, statement) - return pass(pushlex("stat"), expression, expect(";"), poplex); - } - function maybeCatchBinding(type) { - if (type == "(") return cont(funarg, expect(")")) - } - function expression(type, value) { - return expressionInner(type, value, false); - } - function expressionNoComma(type, value) { - return expressionInner(type, value, true); - } - function parenExpr(type) { - if (type != "(") return pass() - return cont(pushlex(")"), expression, expect(")"), poplex) - } - function expressionInner(type, value, noComma) { - if (cx.state.fatArrowAt == cx.stream.start) { - var body = noComma ? arrowBodyNoComma : arrowBody; - if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, expect("=>"), body, popcontext); - else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext); - } - - var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma; - if (atomicTypes.hasOwnProperty(type)) return cont(maybeop); - if (type == "function") return cont(functiondef, maybeop); - if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), classExpression, poplex); } - if (type == "keyword c" || type == "async") return cont(noComma ? expressionNoComma : expression); - if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop); - if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression); - if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop); - if (type == "{") return contCommasep(objprop, "}", null, maybeop); - if (type == "quasi") return pass(quasi, maybeop); - if (type == "new") return cont(maybeTarget(noComma)); - if (type == "import") return cont(expression); - return cont(); - } - function maybeexpression(type) { - if (type.match(/[;\}\)\],]/)) return pass(); - return pass(expression); - } - - function maybeoperatorComma(type, value) { - if (type == ",") return cont(expression); - return maybeoperatorNoComma(type, value, false); - } - function maybeoperatorNoComma(type, value, noComma) { - var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma; - var expr = noComma == false ? expression : expressionNoComma; - if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext); - if (type == "operator") { - if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me); - if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false)) - return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me); - if (value == "?") return cont(expression, expect(":"), expr); - return cont(expr); - } - if (type == "quasi") { return pass(quasi, me); } - if (type == ";") return; - if (type == "(") return contCommasep(expressionNoComma, ")", "call", me); - if (type == ".") return cont(property, me); - if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me); - if (isTS && value == "as") { cx.marked = "keyword"; return cont(typeexpr, me) } - if (type == "regexp") { - cx.state.lastType = cx.marked = "operator" - cx.stream.backUp(cx.stream.pos - cx.stream.start - 1) - return cont(expr) - } - } - function quasi(type, value) { - if (type != "quasi") return pass(); - if (value.slice(value.length - 2) != "${") return cont(quasi); - return cont(expression, continueQuasi); - } - function continueQuasi(type) { - if (type == "}") { - cx.marked = "string-2"; - cx.state.tokenize = tokenQuasi; - return cont(quasi); - } - } - function arrowBody(type) { - findFatArrow(cx.stream, cx.state); - return pass(type == "{" ? statement : expression); - } - function arrowBodyNoComma(type) { - findFatArrow(cx.stream, cx.state); - return pass(type == "{" ? statement : expressionNoComma); - } - function maybeTarget(noComma) { - return function(type) { - if (type == ".") return cont(noComma ? targetNoComma : target); - else if (type == "variable" && isTS) return cont(maybeTypeArgs, noComma ? maybeoperatorNoComma : maybeoperatorComma) - else return pass(noComma ? expressionNoComma : expression); - }; - } - function target(_, value) { - if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorComma); } - } - function targetNoComma(_, value) { - if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorNoComma); } - } - function maybelabel(type) { - if (type == ":") return cont(poplex, statement); - return pass(maybeoperatorComma, expect(";"), poplex); - } - function property(type) { - if (type == "variable") {cx.marked = "property"; return cont();} - } - function objprop(type, value) { - if (type == "async") { - cx.marked = "property"; - return cont(objprop); - } else if (type == "variable" || cx.style == "keyword") { - cx.marked = "property"; - if (value == "get" || value == "set") return cont(getterSetter); - var m // Work around fat-arrow-detection complication for detecting typescript typed arrow params - if (isTS && cx.state.fatArrowAt == cx.stream.start && (m = cx.stream.match(/^\s*:\s*/, false))) - cx.state.fatArrowAt = cx.stream.pos + m[0].length - return cont(afterprop); - } else if (type == "number" || type == "string") { - cx.marked = jsonldMode ? "property" : (cx.style + " property"); - return cont(afterprop); - } else if (type == "jsonld-keyword") { - return cont(afterprop); - } else if (isTS && isModifier(value)) { - cx.marked = "keyword" - return cont(objprop) - } else if (type == "[") { - return cont(expression, maybetype, expect("]"), afterprop); - } else if (type == "spread") { - return cont(expressionNoComma, afterprop); - } else if (value == "*") { - cx.marked = "keyword"; - return cont(objprop); - } else if (type == ":") { - return pass(afterprop) - } - } - function getterSetter(type) { - if (type != "variable") return pass(afterprop); - cx.marked = "property"; - return cont(functiondef); - } - function afterprop(type) { - if (type == ":") return cont(expressionNoComma); - if (type == "(") return pass(functiondef); - } - function commasep(what, end, sep) { - function proceed(type, value) { - if (sep ? sep.indexOf(type) > -1 : type == ",") { - var lex = cx.state.lexical; - if (lex.info == "call") lex.pos = (lex.pos || 0) + 1; - return cont(function(type, value) { - if (type == end || value == end) return pass() - return pass(what) - }, proceed); - } - if (type == end || value == end) return cont(); - if (sep && sep.indexOf(";") > -1) return pass(what) - return cont(expect(end)); - } - return function(type, value) { - if (type == end || value == end) return cont(); - return pass(what, proceed); - }; - } - function contCommasep(what, end, info) { - for (var i = 3; i < arguments.length; i++) - cx.cc.push(arguments[i]); - return cont(pushlex(end, info), commasep(what, end), poplex); - } - function block(type) { - if (type == "}") return cont(); - return pass(statement, block); - } - function maybetype(type, value) { - if (isTS) { - if (type == ":" || value == "in") return cont(typeexpr); - if (value == "?") return cont(maybetype); - } - } - function mayberettype(type) { - if (isTS && type == ":") { - if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr) - else return cont(typeexpr) - } - } - function isKW(_, value) { - if (value == "is") { - cx.marked = "keyword" - return cont() - } - } - function typeexpr(type, value) { - if (value == "keyof" || value == "typeof" || value == "infer") { - cx.marked = "keyword" - return cont(value == "typeof" ? expressionNoComma : typeexpr) - } - if (type == "variable" || value == "void") { - cx.marked = "type" - return cont(afterType) - } - if (type == "string" || type == "number" || type == "atom") return cont(afterType); - if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType) - if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType) - if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType, afterType) - if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr) - } - function maybeReturnType(type) { - if (type == "=>") return cont(typeexpr) - } - function typeprop(type, value) { - if (type == "variable" || cx.style == "keyword") { - cx.marked = "property" - return cont(typeprop) - } else if (value == "?" || type == "number" || type == "string") { - return cont(typeprop) - } else if (type == ":") { - return cont(typeexpr) - } else if (type == "[") { - return cont(expect("variable"), maybetype, expect("]"), typeprop) - } else if (type == "(") { - return pass(functiondecl, typeprop) - } - } - function typearg(type, value) { - if (type == "variable" && cx.stream.match(/^\s*[?:]/, false) || value == "?") return cont(typearg) - if (type == ":") return cont(typeexpr) - if (type == "spread") return cont(typearg) - return pass(typeexpr) - } - function afterType(type, value) { - if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType) - if (value == "|" || type == "." || value == "&") return cont(typeexpr) - if (type == "[") return cont(typeexpr, expect("]"), afterType) - if (value == "extends" || value == "implements") { cx.marked = "keyword"; return cont(typeexpr) } - if (value == "?") return cont(typeexpr, expect(":"), typeexpr) - } - function maybeTypeArgs(_, value) { - if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType) - } - function typeparam() { - return pass(typeexpr, maybeTypeDefault) - } - function maybeTypeDefault(_, value) { - if (value == "=") return cont(typeexpr) - } - function vardef(_, value) { - if (value == "enum") {cx.marked = "keyword"; return cont(enumdef)} - return pass(pattern, maybetype, maybeAssign, vardefCont); - } - function pattern(type, value) { - if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(pattern) } - if (type == "variable") { register(value); return cont(); } - if (type == "spread") return cont(pattern); - if (type == "[") return contCommasep(eltpattern, "]"); - if (type == "{") return contCommasep(proppattern, "}"); - } - function proppattern(type, value) { - if (type == "variable" && !cx.stream.match(/^\s*:/, false)) { - register(value); - return cont(maybeAssign); - } - if (type == "variable") cx.marked = "property"; - if (type == "spread") return cont(pattern); - if (type == "}") return pass(); - if (type == "[") return cont(expression, expect(']'), expect(':'), proppattern); - return cont(expect(":"), pattern, maybeAssign); - } - function eltpattern() { - return pass(pattern, maybeAssign) - } - function maybeAssign(_type, value) { - if (value == "=") return cont(expressionNoComma); - } - function vardefCont(type) { - if (type == ",") return cont(vardef); - } - function maybeelse(type, value) { - if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex); - } - function forspec(type, value) { - if (value == "await") return cont(forspec); - if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex); - } - function forspec1(type) { - if (type == "var") return cont(vardef, expect(";"), forspec2); - if (type == ";") return cont(forspec2); - if (type == "variable") return cont(formaybeinof); - return pass(expression, expect(";"), forspec2); - } - function formaybeinof(_type, value) { - if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); } - return cont(maybeoperatorComma, forspec2); - } - function forspec2(type, value) { - if (type == ";") return cont(forspec3); - if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); } - return pass(expression, expect(";"), forspec3); - } - function forspec3(type) { - if (type != ")") cont(expression); - } - function functiondef(type, value) { - if (value == "*") {cx.marked = "keyword"; return cont(functiondef);} - if (type == "variable") {register(value); return cont(functiondef);} - if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, statement, popcontext); - if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondef) - } - function functiondecl(type, value) { - if (value == "*") {cx.marked = "keyword"; return cont(functiondecl);} - if (type == "variable") {register(value); return cont(functiondecl);} - if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, popcontext); - if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondecl) - } - function typename(type, value) { - if (type == "keyword" || type == "variable") { - cx.marked = "type" - return cont(typename) - } else if (value == "<") { - return cont(pushlex(">"), commasep(typeparam, ">"), poplex) - } - } - function funarg(type, value) { - if (value == "@") cont(expression, funarg) - if (type == "spread") return cont(funarg); - if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(funarg); } - return pass(pattern, maybetype, maybeAssign); - } - function classExpression(type, value) { - // Class expressions may have an optional name. - if (type == "variable") return className(type, value); - return classNameAfter(type, value); - } - function className(type, value) { - if (type == "variable") {register(value); return cont(classNameAfter);} - } - function classNameAfter(type, value) { - if (value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, classNameAfter) - if (value == "extends" || value == "implements" || (isTS && type == ",")) { - if (value == "implements") cx.marked = "keyword"; - return cont(isTS ? typeexpr : expression, classNameAfter); - } - if (type == "{") return cont(pushlex("}"), classBody, poplex); - } - function classBody(type, value) { - if (type == "async" || - (type == "variable" && - (value == "static" || value == "get" || value == "set" || (isTS && isModifier(value))) && - cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false))) { - cx.marked = "keyword"; - return cont(classBody); - } - if (type == "variable" || cx.style == "keyword") { - cx.marked = "property"; - return cont(isTS ? classfield : functiondef, classBody); - } - if (type == "number" || type == "string") return cont(isTS ? classfield : functiondef, classBody); - if (type == "[") - return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody) - if (value == "*") { - cx.marked = "keyword"; - return cont(classBody); - } - if (isTS && type == "(") return pass(functiondecl, classBody) - if (type == ";" || type == ",") return cont(classBody); - if (type == "}") return cont(); - if (value == "@") return cont(expression, classBody) - } - function classfield(type, value) { - if (value == "?") return cont(classfield) - if (type == ":") return cont(typeexpr, maybeAssign) - if (value == "=") return cont(expressionNoComma) - var context = cx.state.lexical.prev, isInterface = context && context.info == "interface" - return pass(isInterface ? functiondecl : functiondef) - } - function afterExport(type, value) { - if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); } - if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); } - if (type == "{") return cont(commasep(exportField, "}"), maybeFrom, expect(";")); - return pass(statement); - } - function exportField(type, value) { - if (value == "as") { cx.marked = "keyword"; return cont(expect("variable")); } - if (type == "variable") return pass(expressionNoComma, exportField); - } - function afterImport(type) { - if (type == "string") return cont(); - if (type == "(") return pass(expression); - return pass(importSpec, maybeMoreImports, maybeFrom); - } - function importSpec(type, value) { - if (type == "{") return contCommasep(importSpec, "}"); - if (type == "variable") register(value); - if (value == "*") cx.marked = "keyword"; - return cont(maybeAs); - } - function maybeMoreImports(type) { - if (type == ",") return cont(importSpec, maybeMoreImports) - } - function maybeAs(_type, value) { - if (value == "as") { cx.marked = "keyword"; return cont(importSpec); } - } - function maybeFrom(_type, value) { - if (value == "from") { cx.marked = "keyword"; return cont(expression); } - } - function arrayLiteral(type) { - if (type == "]") return cont(); - return pass(commasep(expressionNoComma, "]")); - } - function enumdef() { - return pass(pushlex("form"), pattern, expect("{"), pushlex("}"), commasep(enummember, "}"), poplex, poplex) - } - function enummember() { - return pass(pattern, maybeAssign); - } - - function isContinuedStatement(state, textAfter) { - return state.lastType == "operator" || state.lastType == "," || - isOperatorChar.test(textAfter.charAt(0)) || - /[,.]/.test(textAfter.charAt(0)); - } - - function expressionAllowed(stream, state, backUp) { - return state.tokenize == tokenBase && - /^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) || - (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0)))) - } - - // Interface - - return { - startState: function(basecolumn) { - var state = { - tokenize: tokenBase, - lastType: "sof", - cc: [], - lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false), - localVars: parserConfig.localVars, - context: parserConfig.localVars && new Context(null, null, false), - indented: basecolumn || 0, - }; - if (parserConfig.globalVars && typeof parserConfig.globalVars == "object") - state.globalVars = parserConfig.globalVars; - return state; - }, - - token: function(stream, state) { - if (stream.sol()) { - if (!state.lexical.hasOwnProperty("align")) - state.lexical.align = false; - state.indented = stream.indentation(); - findFatArrow(stream, state); - } - if (state.tokenize != tokenComment && stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - if (type == "comment") return style; - state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type; - return parseJS(state, style, type, content, stream); - }, - - indent: function(state, textAfter) { - if (state.tokenize == tokenComment) return CodeMirror.Pass; - if (state.tokenize != tokenBase) return 0; - var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, top - // Kludge to prevent 'maybelse' from blocking lexical scope pops - if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) { - var c = state.cc[i]; - if (c == poplex) lexical = lexical.prev; - else if (c != maybeelse) break; - } - while ((lexical.type == "stat" || lexical.type == "form") && - (firstChar == "}" || ((top = state.cc[state.cc.length - 1]) && - (top == maybeoperatorComma || top == maybeoperatorNoComma) && - !/^[,\.=+\-*:?[\(]/.test(textAfter)))) - lexical = lexical.prev; - if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat") - lexical = lexical.prev; - var type = lexical.type, closing = firstChar == type; - - if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info.length + 1 : 0); - else if (type == "form" && firstChar == "{") return lexical.indented; - else if (type == "form") return lexical.indented + indentUnit; - else if (type == "stat") - return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0); - else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false) - return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit); - else if (lexical.align) return lexical.column + (closing ? 0 : 1); - else return lexical.indented + (closing ? 0 : indentUnit); - }, - - electricInput: /^\s*(?:case .*?:|default:|\{|\})$/, - blockCommentStart: jsonMode ? null : "/*", - blockCommentEnd: jsonMode ? null : "*/", - blockCommentContinue: jsonMode ? null : " * ", - lineComment: jsonMode ? null : "//", - fold: "brace", - closeBrackets: "()[]{}''\"\"``", - - helperType: jsonMode ? "json" : "netscript", - jsonldMode: jsonldMode, - jsonMode: jsonMode, - - expressionAllowed: expressionAllowed, - - skipExpression: function(state) { - var top = state.cc[state.cc.length - 1] - if (top == expression || top == expressionNoComma) state.cc.pop() - }, - }; -}); - -CodeMirror.registerHelper("wordChars", "netscript", /[\w$]/); - -CodeMirror.defineMIME("text/netscript", "netscript"); -CodeMirror.defineMIME("text/ecmascript", "netscript"); -CodeMirror.defineMIME("application/netscript", "netscript"); -CodeMirror.defineMIME("application/x-netscript", "netscript"); -CodeMirror.defineMIME("application/ecmascript", "netscript"); -CodeMirror.defineMIME("application/json", {name: "netscript", json: true}); -CodeMirror.defineMIME("application/x-json", {name: "netscript", json: true}); -CodeMirror.defineMIME("application/ld+json", {name: "netscript", jsonld: true}); -CodeMirror.defineMIME("text/typescript", { name: "netscript", typescript: true }); -CodeMirror.defineMIME("application/typescript", { name: "netscript", typescript: true }); - -}); diff --git a/src/ScriptEditor/ScriptEditor.js b/src/ScriptEditor/ScriptEditor.js deleted file mode 100644 index dc2b301a7..000000000 --- a/src/ScriptEditor/ScriptEditor.js +++ /dev/null @@ -1,61 +0,0 @@ -import { CursorPositions } from './CursorPositions'; - -// Base Script Editor class for the Ace/CodeMirror/etc. wrappers -import { js_beautify as beautify } from 'js-beautify'; - -export class ScriptEditor { - constructor() { - this.editor = null; // Stores the CodeMirror editor reference - this.filenameInput = null; // Stores the filename input DOM element - } - - init() { - throw new Error(`Tried to initialize base ScriptEditor class`); - } - - beautifyScript() { - if (this.editor == null) { - console.warn(`ScriptEditor.beautifyScript() called when editor was not initialized`); - return; - } - let code = this.editor.getValue(); - code = beautify(code, { - indent_size: 4, - brace_style: "preserve-inline", - }); - this.editor.setValue(code); - } - - openScript(filename="", code="") { - if (this.editor == null || this.filenameInput == null) { - console.warn(`ScriptEditor.openScript() called when editor was not initialized`); - return; - } - - if (filename != "") { - this.filenameInput.value = filename; - this.editor.setValue(code); - this.setCursor(CursorPositions.getCursor(filename)); - } - - this.editor.focus(); - } - - getCode() { - if (this.editor == null) { - console.warn(`ScriptEditor.getCode() called when editor was not initialized`); - return ""; - } - - return this.editor.getValue(); - } - - getFilename() { - if (this.filenameInput == null) { - console.warn(`ScriptEditor.getFilename() called when editor was not initialized`); - return ""; - } - - return this.filenameInput.value; - } -} diff --git a/src/Terminal.jsx b/src/Terminal.jsx index 26c465eaa..25953f472 100644 --- a/src/Terminal.jsx +++ b/src/Terminal.jsx @@ -56,7 +56,6 @@ import { RunningScript } from "./Script/RunningScript"; import { compareArrays } from "../utils/helpers/compareArrays"; import { getRamUsageFromRunningScript } from "./Script/RunningScriptHelpers"; import { - getCurrentEditor, findRunningScript, findRunningScriptByPid, } from "./Script/ScriptHelpers"; @@ -1888,7 +1887,6 @@ let Terminal = { }`; } Engine.loadScriptEditorContent(filepath, code); - getCurrentEditor().setCursor({row: 1, column: 4}); } else { Engine.loadScriptEditorContent(filepath, script.code); }