From 59f8c45246e90a1950f7b1044407cd2363be2f8e Mon Sep 17 00:00:00 2001
From: Jeremy Rifkin <51220084+jeremy-rifkin@users.noreply.github.com>
Date: Fri, 13 Jan 2023 19:54:26 -0500
Subject: [PATCH] Update static/modes typing (#4582)

---
 static/modes/ada-mode.ts                | 18 ++++++++----
 static/modes/asm-mode.ts                |  6 ++--
 static/modes/asm6502-mode.ts            |  6 ++--
 static/modes/asmruby-mode.ts            | 14 ++++------
 static/modes/carbon-mode.ts             |  8 ++----
 static/modes/clean-mode.ts              |  6 ++--
 static/modes/cmake-mode.ts              | 27 ++++++------------
 static/modes/cpp-for-opencl-mode.ts     |  9 +++---
 static/modes/cppcircle-mode.ts          |  8 +++---
 static/modes/cppfront-mode.ts           |  8 +++---
 static/modes/cppp-mode.ts               |  6 ++--
 static/modes/cppx-blue-mode.ts          |  8 +++---
 static/modes/cppx-gold-mode.ts          |  8 ++----
 static/modes/crystal-mode.ts            |  8 ++----
 static/modes/cuda-mode.ts               |  8 +++---
 static/modes/d-mode.ts                  |  8 ++----
 static/modes/erlang-mode.ts             | 12 ++++----
 static/modes/fortran-mode.ts            |  8 ++----
 static/modes/gccdump-rtl-gimple-mode.ts |  6 ++--
 static/modes/haskell-mode.ts            |  6 ++--
 static/modes/hlsl-mode.ts               |  6 ++--
 static/modes/hook-mode.ts               |  4 +--
 static/modes/ispc-mode.ts               |  6 ++--
 static/modes/jakt-mode.ts               |  6 ++--
 static/modes/nc-mode.ts                 |  6 ++--
 static/modes/nim-mode.ts                | 22 +++++++--------
 static/modes/ocaml-mode.ts              |  6 ++--
 static/modes/openclc-mode.ts            |  9 +++---
 static/modes/ptx-mode.ts                |  7 +++--
 static/modes/spirv-mode.ts              |  6 ++--
 static/modes/toit-mode.ts               | 37 ++++++++-----------------
 static/modes/zig-mode.ts                |  6 ++--
 32 files changed, 131 insertions(+), 178 deletions(-)

diff --git a/static/modes/ada-mode.ts b/static/modes/ada-mode.ts
index 7dfd3a24613..8d56e2c928b 100644
--- a/static/modes/ada-mode.ts
+++ b/static/modes/ada-mode.ts
@@ -22,11 +22,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-'use strict';
+import * as monaco from 'monaco-editor';
 
-const monaco = require('monaco-editor');
-
-export function definition() {
+export function definition(): monaco.languages.IMonarchLanguage {
     // Ada 2012 Language Definition
     return {
         keywords: [
@@ -151,8 +149,16 @@ export function definition() {
             '/=',
         ],
         brackets: [
-            ['(', ')', 'delimiter.parenthesis'],
-            ['[', ']', 'delimiter.square'],
+            {
+                open: '(',
+                close: ')',
+                token: 'delimiter.parenthesis',
+            },
+            {
+                open: '[',
+                close: ']',
+                token: 'delimiter.square',
+            },
         ],
         symbols: /[=><!~&|+\-*/^]+/,
         delimiters: /[;=.:,`]/,
diff --git a/static/modes/asm-mode.ts b/static/modes/asm-mode.ts
index d9502468e25..aa90c564549 100644
--- a/static/modes/asm-mode.ts
+++ b/static/modes/asm-mode.ts
@@ -21,11 +21,9 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         // Set defaultToken to invalid to see what you do not tokenize yet
         defaultToken: 'invalid',
diff --git a/static/modes/asm6502-mode.ts b/static/modes/asm6502-mode.ts
index 17f537ff448..0e83a385737 100644
--- a/static/modes/asm6502-mode.ts
+++ b/static/modes/asm6502-mode.ts
@@ -22,11 +22,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-'use strict';
+import * as monaco from 'monaco-editor';
 
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         tokenizer: {
             root: [
diff --git a/static/modes/asmruby-mode.ts b/static/modes/asmruby-mode.ts
index 3bd3b7ca9e0..f8172488036 100644
--- a/static/modes/asmruby-mode.ts
+++ b/static/modes/asmruby-mode.ts
@@ -22,11 +22,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-'use strict';
+import * as monaco from 'monaco-editor';
 
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         tokenizer: {
             root: [
@@ -35,17 +33,17 @@ function definition() {
                 [/^(\| )*local table.*$/, 'comment'],
                 [/^(\| )*\[\s*\d+\].*$/, 'comment'],
                 [/^(\| )*\|-+$/, 'comment'],
-                [/^((?:\| )*)(\d+)/, ['comment', {token: 'number', next: '@opcode'}]],
-                [/^((?:\| )*)(\d+)(\s+)/, ['comment', 'number', {token: '', next: '@opcode'}]],
+                [/^((?:\| )*)(\d+)/, ['comment', 'number'], '@opcode'],
+                [/^((?:\| )*)(\d+)(\s+)/, ['comment', 'number'], '@opcode'],
             ],
 
             opcode: [
                 [/[a-z_]\w*\s*$/, {token: 'keyword', next: '@root'}],
-                [/([a-z_]\w*)(\s+)/, ['keyword', {token: '', next: '@arguments'}]],
+                [/([a-z_]\w*)(\s+)/, 'keyword', '@arguments'],
             ],
 
             arguments: [
-                [/(.*?)(\(\s*\d+\)(?:\[[^\]]+\])?)$/, ['', {token: 'comment', next: '@root'}]],
+                [/(.*?)(\(\s*\d+\)(?:\[[^\]]+\])?)$/, {token: 'comment', next: '@root'}],
                 [/.*$/, {token: '', next: '@root'}],
             ],
         },
diff --git a/static/modes/carbon-mode.ts b/static/modes/carbon-mode.ts
index 13afdb44c12..0b6cf01a115 100644
--- a/static/modes/carbon-mode.ts
+++ b/static/modes/carbon-mode.ts
@@ -22,12 +22,10 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-'use strict';
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         defaultToken: 'invalid', // for debugging
 
diff --git a/static/modes/clean-mode.ts b/static/modes/clean-mode.ts
index 3e2bfd12928..9ea31bcddf2 100644
--- a/static/modes/clean-mode.ts
+++ b/static/modes/clean-mode.ts
@@ -21,11 +21,9 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         keywords: [
             'module',
diff --git a/static/modes/cmake-mode.ts b/static/modes/cmake-mode.ts
index 6dac9c423ff..7d5aea6420d 100644
--- a/static/modes/cmake-mode.ts
+++ b/static/modes/cmake-mode.ts
@@ -21,11 +21,9 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         symbols: /[=><!~?&|+\-*/^;.,]+/,
         escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
@@ -78,7 +76,7 @@ function definition() {
     };
 }
 
-function configuration() {
+function configuration(): monaco.languages.LanguageConfiguration {
     return {
         indentationRules: {
             decreaseIndentPattern: /^(.*\*\/)?\s*\}.*$/,
@@ -92,20 +90,11 @@ function configuration() {
             ['{', '}'],
             ['(', ')'],
         ],
-        __electricCharacterSupport: {
-            brackets: [
-                {tokenType: 'delimiter.curly.ts', open: '{', close: '}', isElectric: true},
-                {tokenType: 'delimiter.square.ts', open: '[', close: ']', isElectric: true},
-                {tokenType: 'delimiter.paren.ts', open: '(', close: ')', isElectric: true},
-            ],
-        },
-        __characterPairSupport: {
-            autoClosingPairs: [
-                {open: '{', close: '}'},
-                {open: '(', close: ')'},
-                {open: '"', close: '"', notIn: ['string']},
-            ],
-        },
+        autoClosingPairs: [
+            {open: '{', close: '}'},
+            {open: '(', close: ')'},
+            {open: '"', close: '"', notIn: ['string']},
+        ],
     };
 }
 
diff --git a/static/modes/cpp-for-opencl-mode.ts b/static/modes/cpp-for-opencl-mode.ts
index d391eecbbcc..5ccaa48b7a2 100644
--- a/static/modes/cpp-for-opencl-mode.ts
+++ b/static/modes/cpp-for-opencl-mode.ts
@@ -24,13 +24,14 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
-const cppp = require('./cppp-mode');
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
+
+import * as cppp from './cppp-mode';
 
 // We need to create a new definition for C++ for OpenCL so we can remove invalid keywords
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     const cppForOpenCL = $.extend(true, {}, cppp); // deep copy
 
     function addKeywords(keywords) {
diff --git a/static/modes/cppcircle-mode.ts b/static/modes/cppcircle-mode.ts
index 60561d6edd1..0e9d0d2a06a 100644
--- a/static/modes/cppcircle-mode.ts
+++ b/static/modes/cppcircle-mode.ts
@@ -24,13 +24,13 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
-const cppp = require('./cppp-mode');
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
+import * as cppp from './cppp-mode';
 
 // circle is c++ with a few extra '@'-prefixed keywords.
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     const cppcircle = $.extend(true, {}, cppp); // deep copy
 
     function addKeywords(keywords) {
diff --git a/static/modes/cppfront-mode.ts b/static/modes/cppfront-mode.ts
index d0066362020..e522df4b51f 100644
--- a/static/modes/cppfront-mode.ts
+++ b/static/modes/cppfront-mode.ts
@@ -24,11 +24,11 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
-const cppp = require('./cppp-mode');
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
+import * as cppp from './cppp-mode';
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     const cppfront = $.extend(true, {}, cppp); // deep copy
     cppfront.tokenPostfix = '.herb';
 
diff --git a/static/modes/cppp-mode.ts b/static/modes/cppp-mode.ts
index 03cff9e1f52..8b254b5edb5 100644
--- a/static/modes/cppp-mode.ts
+++ b/static/modes/cppp-mode.ts
@@ -24,12 +24,12 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
 
 // We need to create a new definition for cpp so we can remove invalid keywords
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     const cppp = $.extend(true, {}, cpp.language); // deep copy
 
     function removeKeyword(keyword) {
diff --git a/static/modes/cppx-blue-mode.ts b/static/modes/cppx-blue-mode.ts
index e3972bdf41f..69b23343e20 100644
--- a/static/modes/cppx-blue-mode.ts
+++ b/static/modes/cppx-blue-mode.ts
@@ -24,11 +24,11 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
-const cppp = require('./cppp-mode');
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
+import * as cppp from './cppp-mode';
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     const cppx_blue = $.extend(true, {}, cppp); // deep copy
     cppx_blue.tokenPostfix = '.herb';
 
diff --git a/static/modes/cppx-gold-mode.ts b/static/modes/cppx-gold-mode.ts
index f39978d9b68..3444474686d 100644
--- a/static/modes/cppx-gold-mode.ts
+++ b/static/modes/cppx-gold-mode.ts
@@ -23,11 +23,9 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 // Originally based on `./d-mode.js` by the Compiler Explorer Authors
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         defaultToken: '',
 
@@ -273,7 +271,7 @@ function definition() {
     };
 }
 
-function configuration() {
+function configuration(): monaco.languages.LanguageConfiguration {
     return {
         comments: {
             lineComment: '#',
diff --git a/static/modes/crystal-mode.ts b/static/modes/crystal-mode.ts
index 5a4340a17a5..176854f8556 100644
--- a/static/modes/crystal-mode.ts
+++ b/static/modes/crystal-mode.ts
@@ -22,11 +22,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-'use strict';
+import * as monaco from 'monaco-editor';
 
-const monaco = require('monaco-editor');
-
-function configuration() {
+function configuration(): monaco.languages.LanguageConfiguration {
     return {
         comments: {
             lineComment: '#',
@@ -68,7 +66,7 @@ function configuration() {
     };
 }
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         keywords: [
             'abstract',
diff --git a/static/modes/cuda-mode.ts b/static/modes/cuda-mode.ts
index 7d5ff2ef1b1..2333594bff4 100644
--- a/static/modes/cuda-mode.ts
+++ b/static/modes/cuda-mode.ts
@@ -24,13 +24,13 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
-const cppp = require('./cppp-mode');
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
+import * as cppp from './cppp-mode';
 
 // We need to create a new definition for cpp so we can remove invalid keywords
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     const cuda = $.extend(true, {}, cppp); // deep copy
 
     function addKeywords(keywords) {
diff --git a/static/modes/d-mode.ts b/static/modes/d-mode.ts
index b16f71ec43b..c2578debb61 100644
--- a/static/modes/d-mode.ts
+++ b/static/modes/d-mode.ts
@@ -21,11 +21,9 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         defaultToken: 'invalid',
 
@@ -302,7 +300,7 @@ function definition() {
     };
 }
 
-function configuration() {
+function configuration(): monaco.languages.LanguageConfiguration {
     return {
         comments: {
             lineComment: '//',
diff --git a/static/modes/erlang-mode.ts b/static/modes/erlang-mode.ts
index 96937a38764..74919c55d31 100644
--- a/static/modes/erlang-mode.ts
+++ b/static/modes/erlang-mode.ts
@@ -22,9 +22,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-const monaco = require('monaco-editor');
+import * as monaco from 'monaco-editor';
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         commands: ['-module', '-export', '-compile', '-record'],
 
@@ -86,7 +86,7 @@ function definition() {
                 [/[;.,]/, 'delimiter'],
             ],
 
-            whitespace: [[/\s/]],
+            whitespace: [[/\s/, 'whitespace']],
 
             comment: [[/%/, 'comment']],
 
@@ -105,7 +105,7 @@ function definition() {
     };
 }
 
-function configuration() {
+function configuration(): monaco.languages.LanguageConfiguration {
     return {
         comments: {
             lineComment: '%',
@@ -126,8 +126,8 @@ function configuration() {
         ],
         folding: {
             markers: {
-                start: '^\\s*\\%\\%region\\b',
-                end: '^\\s*\\%\\%endregion\\b',
+                start: /^\s*%%region\b/,
+                end: /^\s*%%endregion\b/,
             },
         },
     };
diff --git a/static/modes/fortran-mode.ts b/static/modes/fortran-mode.ts
index cbd548d725f..ce8c3ce9205 100644
--- a/static/modes/fortran-mode.ts
+++ b/static/modes/fortran-mode.ts
@@ -24,11 +24,9 @@
 
 // The lists of keywords, operator, functions, and subroutines have been adopted from
 //    vs.language.fortran, Copyright (c) 2015, Thomas E. Dunn
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         // Fortran is case insensitive, so ignore case...
         ignoreCase: true,
@@ -511,7 +509,7 @@ function definition() {
     };
 }
 
-function configuration() {
+function configuration(): monaco.languages.LanguageConfiguration {
     return {
         comments: {
             lineComment: '!',
diff --git a/static/modes/gccdump-rtl-gimple-mode.ts b/static/modes/gccdump-rtl-gimple-mode.ts
index 00928d44607..c56060ca6e0 100644
--- a/static/modes/gccdump-rtl-gimple-mode.ts
+++ b/static/modes/gccdump-rtl-gimple-mode.ts
@@ -26,11 +26,9 @@
 // Released under the MIT license
 
 // this is mostly based on 'mylang' example from https://microsoft.github.io/monaco-editor/monarch.html
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         // Set defaultToken to invalid to see what you do not tokenize yet
         // defaultToken: 'invalid',
diff --git a/static/modes/haskell-mode.ts b/static/modes/haskell-mode.ts
index 7e1bd9dc957..8251f94f75d 100644
--- a/static/modes/haskell-mode.ts
+++ b/static/modes/haskell-mode.ts
@@ -21,11 +21,9 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         keywords: [
             'module',
diff --git a/static/modes/hlsl-mode.ts b/static/modes/hlsl-mode.ts
index 0e8d67fd15a..26e3918ddb0 100644
--- a/static/modes/hlsl-mode.ts
+++ b/static/modes/hlsl-mode.ts
@@ -24,10 +24,10 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     const hlsl = $.extend(true, {}, cpp.language);
 
     function addKeywords(keywords) {
diff --git a/static/modes/hook-mode.ts b/static/modes/hook-mode.ts
index 4f154437044..c7f98ddc206 100644
--- a/static/modes/hook-mode.ts
+++ b/static/modes/hook-mode.ts
@@ -22,9 +22,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-const monaco = require('monaco-editor');
+import * as monaco from 'monaco-editor';
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         defaultToken: 'invalid',
 
diff --git a/static/modes/ispc-mode.ts b/static/modes/ispc-mode.ts
index 024426eb965..455257a06e0 100644
--- a/static/modes/ispc-mode.ts
+++ b/static/modes/ispc-mode.ts
@@ -24,10 +24,10 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     const ispc = $.extend(true, {}, cpp.language); // deep copy
 
     ispc.tokenPostfix = '.ispc';
diff --git a/static/modes/jakt-mode.ts b/static/modes/jakt-mode.ts
index e3a9c4b236c..0bb22ba9335 100644
--- a/static/modes/jakt-mode.ts
+++ b/static/modes/jakt-mode.ts
@@ -21,11 +21,9 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         defaultToken: 'invalid',
 
diff --git a/static/modes/nc-mode.ts b/static/modes/nc-mode.ts
index 63707756b1e..70b2bfaafdd 100644
--- a/static/modes/nc-mode.ts
+++ b/static/modes/nc-mode.ts
@@ -24,12 +24,12 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
 
 // We need to ensure we use proper keywords for the Monaco Editor matcher. Note how
 // https://github.com/Microsoft/monaco-languages/ lacks, as far as I can tell, proper C support. We cheat and use C++
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     const nc = $.extend(true, {}, cpp.language); // deep copy
     // https://en.cppreference.com/w/c/keyword
     nc.keywords = [
diff --git a/static/modes/nim-mode.ts b/static/modes/nim-mode.ts
index 73f9163c290..ab927d8574d 100644
--- a/static/modes/nim-mode.ts
+++ b/static/modes/nim-mode.ts
@@ -21,11 +21,9 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     // Nim language definition
 
     return {
@@ -100,14 +98,14 @@ function definition() {
         binNumber: /0(b|B)[0-1](_?[0-1])*/,
         exponent: /(e|E)(\+|-)?\d(_?\d)*/,
         brackets: [
-            ['{', '}', 'delimiter.curly'],
-            ['{.', '.}', 'delimiter.curly'],
-            ['[', ']', 'delimiter.square'],
-            ['[:', ']', 'delimiter.square'],
-            ['[.', '.]', 'delimiter.square'],
-            ['(', ')', 'delimiter.parenthesis'],
-            ['(.', '.)', 'delimiter.parenthesis'],
-            ['<', '>', 'delimiter.angle'],
+            {open: '{', close: '}', token: 'delimiter.curly'},
+            {open: '{.', close: '.}', token: 'delimiter.curly'},
+            {open: '[', close: ']', token: 'delimiter.square'},
+            {open: '[:', close: ']', token: 'delimiter.square'},
+            {open: '[.', close: '.]', token: 'delimiter.square'},
+            {open: '(', close: ')', token: 'delimiter.parenthesis'},
+            {open: '(.', close: '.)', token: 'delimiter.parenthesis'},
+            {open: '<', close: '>', token: 'delimiter.angle'},
         ],
 
         // The main tokenizer for our languages
diff --git a/static/modes/ocaml-mode.ts b/static/modes/ocaml-mode.ts
index ce179b08e8e..e6de4801549 100644
--- a/static/modes/ocaml-mode.ts
+++ b/static/modes/ocaml-mode.ts
@@ -21,11 +21,9 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         keywords: [
             'and',
diff --git a/static/modes/openclc-mode.ts b/static/modes/openclc-mode.ts
index afa0700829d..e2a31538148 100644
--- a/static/modes/openclc-mode.ts
+++ b/static/modes/openclc-mode.ts
@@ -24,13 +24,14 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const cpp = require('monaco-editor/esm/vs/basic-languages/cpp/cpp');
-const nc = require('./nc-mode');
+import * as monaco from 'monaco-editor';
+import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp';
+
+import * as nc from './nc-mode';
 
 // We need to create a new definition for OpenCL C so we can add keywords
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     const openclc = $.extend(true, {}, nc); // deep copy
 
     function removeKeyword(keyword) {
diff --git a/static/modes/ptx-mode.ts b/static/modes/ptx-mode.ts
index 149addc404a..e0e06b5d4ad 100644
--- a/static/modes/ptx-mode.ts
+++ b/static/modes/ptx-mode.ts
@@ -24,10 +24,11 @@
 
 import $ from 'jquery';
 
-const monaco = require('monaco-editor');
-const asm = require('./asm-mode');
+import * as monaco from 'monaco-editor';
 
-function definition() {
+import * as asm from './asm-mode';
+
+function definition(): monaco.languages.IMonarchLanguage {
     const ptx = $.extend(true, {}, asm); // deep copy
 
     // Redefine registers for ptx:
diff --git a/static/modes/spirv-mode.ts b/static/modes/spirv-mode.ts
index 322390558ee..34fd2fd847b 100644
--- a/static/modes/spirv-mode.ts
+++ b/static/modes/spirv-mode.ts
@@ -21,11 +21,9 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-export function definition() {
+export function definition(): monaco.languages.IMonarchLanguage {
     return {
         defaultToken: 'invalid',
         escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
diff --git a/static/modes/toit-mode.ts b/static/modes/toit-mode.ts
index 3261436d9a0..f10f965a3d1 100644
--- a/static/modes/toit-mode.ts
+++ b/static/modes/toit-mode.ts
@@ -21,41 +21,28 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function configuration() {
+function configuration(): monaco.languages.LanguageConfiguration {
     /* Toit Language Configuration: */
 
     return {
-        comment: [[/\/\*/, 'comment'], [/\*\//, 'comment', '@pop'], [{lineComment: /\/\//}]],
+        comments: {
+            blockComment: ['/*', '*/'],
+            lineComment: '//',
+        },
 
         brackets: [
-            ['{', '}', 'delimiter.curly'],
-            ['[', ']', 'delimiter.square'],
-            ['#[', ']', 'delimiter.square'],
-            ['(', ')', 'delimiter.parenthesis'],
-            ['<', '>', 'delimiter.angle'],
-        ],
-
-        writespace: [[/[ \t\r\n]+/, 'write']],
-
-        string: [
-            [/@escapes/, 'string.escape'],
-            [/"/, 'string', '@pop'],
-        ],
-
-        tripleQuoteString: [[/"""/, 'string', '@pop']],
-        rawString: [[/"/, 'string', '@pop']],
-        character: [
-            [/@charEscapes/, 'string.escape'],
-            [/'/, 'string', '@pop'],
+            ['{', '}'],
+            ['[', ']'],
+            ['#[', ']'],
+            ['(', ')'],
+            ['<', '>'],
         ],
     };
 }
 
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     /* Toit Language Definition: */
 
     return {
diff --git a/static/modes/zig-mode.ts b/static/modes/zig-mode.ts
index d943c8ed91e..d6bb8b39d35 100644
--- a/static/modes/zig-mode.ts
+++ b/static/modes/zig-mode.ts
@@ -21,11 +21,9 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+import * as monaco from 'monaco-editor';
 
-'use strict';
-const monaco = require('monaco-editor');
-
-function definition() {
+function definition(): monaco.languages.IMonarchLanguage {
     return {
         defaultToken: 'invalid',