CodeMirror replaced with my own code editor (#134)

Co-authored-by: Tobias Glasmachers <[email protected]>
TGlas · Jun 7, 2024 · eb686ea · eb686ea
1 parent 2cabd36
commit eb686ea
Show file tree

Hide file tree

Showing 28 changed files with 4,162 additions and 2,934 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tscript",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "",
   "main": "tscript.js",
   "scripts": {
@@ -13,10 +13,8 @@
     "gen-icons": "npx ts-node ./src/ide/gen-icons.ts"
   },
   "devDependencies": {
-    "@codemirror/buildhelper": "^1.0.0",
     "@interactjs/types": "^1.10.2",
     "@types/chai": "^4.2.14",
-    "@types/codemirror": "^5.60.15",
     "@types/lodash": "^4.14.167",
     "@types/mocha": "^9.0.0",
     "chai": "^4.2.0",
@@ -35,7 +33,6 @@
     "webpack-dev-server": "^4.1.1"
   },
   "dependencies": {
-    "codemirror": "^6.0.1",
     "interactjs": "^1.10.2"
   }
 }
diff --git a/src/ide/codemirror-tscriptmode.ts b/src/ide/codemirror-tscriptmode.ts
diff --git a/src/ide/css-dark/ide.css b/src/ide/css-dark/ide.css
@@ -18,18 +18,6 @@
 	box-shadow: inset 0px -1px 0px #292929;
 }
 
-.dark-theme .ide-sourcecode {
-	/* overridden in file codemirror.css, class .CodeMirror */
-	background: #222;
-	color: #fff;
-}
-
-.dark-theme .ide-tab-sourcecode {
-	/* overridden in file codemirror.css, class .CodeMirror */
-	background: #222;
-	color: #fff;
-}
-
 .dark-theme .ide-stackview {
 	background: #222;
 	color: #fff;
@@ -76,28 +64,6 @@
 	color: #26f;
 }
 
-.dark-theme .ide-integer {
-	color: #4fe;
-}
-.dark-theme .ide-real {
-	color: #4f4;
-}
-.dark-theme .ide-string {
-	color: #f44;
-}
-.dark-theme .ide-collection {
-	color: #fa4;
-}
-.dark-theme .ide-keyword {
-	color: #4af;
-}
-.dark-theme .ide-builtin {
-	color: #c4f;
-}
-.dark-theme .ide-userclass {
-	color: #fff;
-}
-
 .dark-theme .tgui-label.ide-state-unchecked {
 	background-color: #970;
 	color: #fe8;

diff --git a/src/ide/css/ide.css b/src/ide/css/ide.css
@@ -84,24 +84,9 @@ button {
 	float: left;
 }
 
-.ide-sourcecode {
-	/* overridden in file codemirror.css, class .CodeMirror */
-	resize: none;
-	width: 60%;
-	height: calc(100% - 200px);
-	background: #fff;
-	color: #000;
-	overflow: scroll;
-}
-
-.ide-tab-sourcecode {
-	/* overridden in file codemirror.css, class .CodeMirror */
-	resize: none;
+.tgui .editor {
 	width: 100%;
-	height: calc(100% - 200px);
-	background: #fff;
-	color: #000;
-	overflow: scroll;
+	height: 100%;
 }
 
 .ide-stackview {
@@ -183,28 +168,6 @@ button {
 	color: #00f;
 }
 
-.ide-integer {
-	color: #088;
-}
-.ide-real {
-	color: #480;
-}
-.ide-string {
-	color: #c00;
-}
-.ide-collection {
-	color: #c60;
-}
-.ide-keyword {
-	color: #00c;
-}
-.ide-builtin {
-	color: #808;
-}
-.ide-userclass {
-	color: #000;
-}
-
 .tgui-tree-cell-toggle {
 	transform: translate(0.5em, 0) scale(1.5);
 }