@harmoniclabs/monaco-editor 0.1.1 → 0.3.0

package/out/languages/amd-tsc/basic-languages/pebble/pebble.d.ts

@@ -3,6 +3,7 @@ export declare const conf: languages.LanguageConfiguration;
 export declare const language: {
     defaultToken: string;
     tokenPostfix: string;
+    controlKeywords: string[];
     keywords: string[];
     typeKeywords: string[];
     operators: string[];
@@ -19,6 +20,7 @@ export declare const language: {
         common: ((string | RegExp)[] | (RegExp | string[])[] | (RegExp | {
             cases: {
                 '@typeKeywords': string;
+                '@controlKeywords': string;
                 '@keywords': string;
                 '@default': string;
             };

package/out/languages/amd-tsc/basic-languages/pebble/pebble.js

@@ -130,14 +130,12 @@ define(["require", "exports", "../../fillers/monaco-editor-core"], function (req
             { open: '(', close: ')' },
             { open: "'", close: "'" },
             { open: '"', close: '"' },
-            { open: '`', close: '`' },
-            { open: '<', close: '<' }
+            { open: '`', close: '`' }
         ],
         colorizedBracketPairs: [
             ['{', '}'],
             ['[', ']'],
-            ['(', ')'],
-            ['<', '>']
+            ['(', ')']
         ],
         autoCloseBefore: ';:.,=}])>` \n\t',
         folding: {
@@ -158,35 +156,43 @@ define(["require", "exports", "../../fillers/monaco-editor-core"], function (req
         // Set defaultToken to invalid to see what you do not tokenize yet
         defaultToken: 'invalid',
         tokenPostfix: '.pebble',
-        keywords: [
-            'as',
-            'assert',
+        controlKeywords: [
+            'if',
+            'else',
+            'for',
+            'while',
             'break',
-            'const',
             'continue',
-            'else',
+            'return',
+            'match',
+            'when',
+            'trace',
+            'fail',
+            'assert',
+            'as',
+            'is'
+        ],
+        keywords: [
+            'const',
+            'let',
+            'var',
+            'function',
+            'struct',
+            'data',
+            'type',
             'enum',
+            'interface',
+            'implements',
+            'using',
+            'import',
             'export',
+            'from',
             'extends',
-            'fail',
+            'true',
             'false',
-            'for',
-            'from',
-            'function',
-            'if',
-            'import',
-            'let',
-            'match',
             'param',
-            'return',
-            'struct',
-            'trace',
-            'true',
-            'type',
-            'var',
-            'while',
-            // contract keywords
             'contract',
+            'state',
             'spend',
             'mint',
             'certify',
@@ -239,7 +245,9 @@ define(["require", "exports", "../../fillers/monaco-editor-core"], function (req
             '&=',
             '|=',
             '^=',
-            '@'
+            '@',
+            '<',
+            '>'
         ],
         // we include these common regular expressions
         symbols: /[=><!~?:&|+\-*\/\^%]+/,
@@ -261,12 +269,32 @@ define(["require", "exports", "../../fillers/monaco-editor-core"], function (req
                 ],
                 // contract param declarations: param name
                 [/(param)(\s+)([a-z_$][\w$]*)/, ['keyword', '', 'identifier']],
+                // const declarations: const name — gets constant identifier token
+                [/(const)(\s+)([a-z_$][\w$]*)/, ['keyword', '', 'identifier.constant']],
+                // let/var declarations: let name
+                [/(let|var)(\s+)([a-z_$][\w$]*)/, ['keyword', '', 'identifier']],
+                // `data struct Name` — `data` is a modifier here (keyword), not the type
+                [/(data)(\s+)(struct)(\s+)([A-Z][\w$]*)/, ['keyword', '', 'keyword', '', 'type.identifier']],
+                // `struct Name` declarations
+                [/(struct)(\s+)([A-Z][\w$]*)/, ['keyword', '', 'type.identifier']],
+                // `state Name` declarations inside a contract
+                [/(state)(\s+)([A-Z][\w$]*)/, ['keyword', '', 'type.identifier']],
+                // `contract Name` declarations
+                [/(contract)(\s+)([A-Z][\w$]*)/, ['keyword', '', 'type.identifier']],
+                // `enum Name` and `interface Name` declarations
+                [/(enum|interface)(\s+)([A-Z][\w$]*)/, ['keyword', '', 'type.identifier']],
+                // Pebble byte-string literals: `#deadbeef`, `#01`, `#""` (empty form).
+                // Must come before the identifier rule which would otherwise eat
+                // `#deadbeef` as a `#identifier`-shape token.
+                [/#[0-9a-fA-F]+\b/, 'number.hex'],
+                [/#""/, 'string'],
                 // identifiers and keywords
                 [
                     /#?[a-z_$][\w$]*/,
                     {
                         cases: {
                             '@typeKeywords': 'type.identifier',
+                            '@controlKeywords': 'keyword.control',
                             '@keywords': 'keyword',
                             '@default': 'identifier'
                         }
@@ -277,7 +305,6 @@ define(["require", "exports", "../../fillers/monaco-editor-core"], function (req
                 { include: '@whitespace' },
                 // delimiters and operators
                 [/[()\[\]]/, '@brackets'],
-                [/[<>](?!@symbols)/, '@brackets'],
                 [/!(?=([^=]|$))/, 'delimiter'],
                 [
                     /@symbols/,

package/out/languages/amd-tsc/basic-languages/pebble/pebble.js.map

@@ -1 +1 @@
-{"version":3,"file":"pebble.js","sourceRoot":"","sources":["../../../../../src/basic-languages/pebble/pebble.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pebble.js","sourceRoot":"","sources":["../../../../../src/basic-languages/pebble/pebble.ts"],"names":[],"mappings":"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"}

package/out/languages/amd-tsc/basic-languages/pebble/pebble.test.js

@@ -6,24 +6,24 @@ define(["require", "exports", "../test/testRunner"], function (require, exports,
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     (0, testRunner_1.testTokenization)('pebble', [
-        // Keywords
+        // Control keywords (purple)
         [
             {
                 line: 'if (x > 0) { return x; }',
                 tokens: [
-                    { startIndex: 0, type: 'keyword.pebble' }, // 'if'
+                    { startIndex: 0, type: 'keyword.control.pebble' }, // 'if'
                     { startIndex: 2, type: '' }, // whitespace
                     { startIndex: 3, type: 'delimiter.parenthesis.pebble' }, // '('
                     { startIndex: 4, type: 'identifier.pebble' }, // 'x'
                     { startIndex: 5, type: '' }, // whitespace
-                    { startIndex: 6, type: 'delimiter.angle.pebble' }, // '>'
+                    { startIndex: 6, type: 'delimiter.pebble' }, // '>'
                     { startIndex: 7, type: '' }, // whitespace
                     { startIndex: 8, type: 'number.pebble' }, // '0'
                     { startIndex: 9, type: 'delimiter.parenthesis.pebble' }, // ')'
                     { startIndex: 10, type: '' }, // whitespace
                     { startIndex: 11, type: 'delimiter.bracket.pebble' }, // '{'
                     { startIndex: 12, type: '' }, // whitespace
-                    { startIndex: 13, type: 'keyword.pebble' }, // 'return'
+                    { startIndex: 13, type: 'keyword.control.pebble' }, // 'return'
                     { startIndex: 19, type: '' }, // whitespace
                     { startIndex: 20, type: 'identifier.pebble' }, // 'x'
                     { startIndex: 21, type: 'delimiter.pebble' }, // ';'
@@ -32,6 +32,96 @@ define(["require", "exports", "../test/testRunner"], function (require, exports,
                 ]
             }
         ],
+        // Const declarations — variable gets identifier.constant
+        [
+            {
+                line: 'const n = 10;',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.pebble' }, // 'const'
+                    { startIndex: 5, type: '' },
+                    { startIndex: 6, type: 'identifier.constant.pebble' }, // 'n'
+                    { startIndex: 7, type: '' },
+                    { startIndex: 8, type: 'delimiter.pebble' }, // '='
+                    { startIndex: 9, type: '' },
+                    { startIndex: 10, type: 'number.pebble' }, // '10'
+                    { startIndex: 12, type: 'delimiter.pebble' } // ';'
+                ]
+            }
+        ],
+        // Let declarations — variable gets identifier
+        [
+            {
+                line: 'let result = 0;',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.pebble' }, // 'let'
+                    { startIndex: 3, type: '' },
+                    { startIndex: 4, type: 'identifier.pebble' }, // 'result'
+                    { startIndex: 10, type: '' },
+                    { startIndex: 11, type: 'delimiter.pebble' }, // '='
+                    { startIndex: 12, type: '' },
+                    { startIndex: 13, type: 'number.pebble' }, // '0'
+                    { startIndex: 14, type: 'delimiter.pebble' } // ';'
+                ]
+            }
+        ],
+        // Comparison operators
+        [
+            {
+                line: 'i <= n',
+                tokens: [
+                    { startIndex: 0, type: 'identifier.pebble' }, // 'i'
+                    { startIndex: 1, type: '' },
+                    { startIndex: 2, type: 'delimiter.pebble' }, // '<='
+                    { startIndex: 4, type: '' },
+                    { startIndex: 5, type: 'identifier.pebble' } // 'n'
+                ]
+            }
+        ],
+        // Control keyword: trace
+        [
+            {
+                line: 'trace result;',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.control.pebble' }, // 'trace'
+                    { startIndex: 5, type: '' },
+                    { startIndex: 6, type: 'identifier.pebble' }, // 'result'
+                    { startIndex: 12, type: 'delimiter.pebble' } // ';'
+                ]
+            }
+        ],
+        // Control keyword: for
+        [
+            {
+                line: 'for( let i = 0; i <= n; i++ ) {',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.control.pebble' }, // 'for'
+                    { startIndex: 3, type: 'delimiter.parenthesis.pebble' }, // '('
+                    { startIndex: 4, type: '' },
+                    { startIndex: 5, type: 'keyword.pebble' }, // 'let'
+                    { startIndex: 8, type: '' },
+                    { startIndex: 9, type: 'identifier.pebble' }, // 'i'
+                    { startIndex: 10, type: '' },
+                    { startIndex: 11, type: 'delimiter.pebble' }, // '='
+                    { startIndex: 12, type: '' },
+                    { startIndex: 13, type: 'number.pebble' }, // '0'
+                    { startIndex: 14, type: 'delimiter.pebble' }, // ';'
+                    { startIndex: 15, type: '' },
+                    { startIndex: 16, type: 'identifier.pebble' }, // 'i'
+                    { startIndex: 17, type: '' },
+                    { startIndex: 18, type: 'delimiter.pebble' }, // '<='
+                    { startIndex: 20, type: '' },
+                    { startIndex: 21, type: 'identifier.pebble' }, // 'n'
+                    { startIndex: 22, type: 'delimiter.pebble' }, // ';'
+                    { startIndex: 23, type: '' },
+                    { startIndex: 24, type: 'identifier.pebble' }, // 'i'
+                    { startIndex: 25, type: 'delimiter.pebble' }, // '++'
+                    { startIndex: 27, type: '' },
+                    { startIndex: 28, type: 'delimiter.parenthesis.pebble' }, // ')'
+                    { startIndex: 29, type: '' },
+                    { startIndex: 30, type: 'delimiter.bracket.pebble' } // '{'
+                ]
+            }
+        ],
         // Built-in types get type.identifier
         [
             {
@@ -39,7 +129,7 @@ define(["require", "exports", "../test/testRunner"], function (require, exports,
                 tokens: [
                     { startIndex: 0, type: 'keyword.pebble' }, // 'const'
                     { startIndex: 5, type: '' },
-                    { startIndex: 6, type: 'identifier.pebble' }, // 'x'
+                    { startIndex: 6, type: 'identifier.constant.pebble' }, // 'x'
                     { startIndex: 7, type: 'delimiter.pebble' }, // ':'
                     { startIndex: 8, type: '' },
                     { startIndex: 9, type: 'type.identifier.pebble' }, // 'int'
@@ -92,87 +182,15 @@ define(["require", "exports", "../test/testRunner"], function (require, exports,
                 ]
             }
         ],
-        // Uppercase identifiers as types
-        [
-            {
-                line: 'let x: PubKeyHash = owner;',
-                tokens: [
-                    { startIndex: 0, type: 'keyword.pebble' }, // 'let'
-                    { startIndex: 3, type: '' },
-                    { startIndex: 4, type: 'identifier.pebble' }, // 'x'
-                    { startIndex: 5, type: 'delimiter.pebble' }, // ':'
-                    { startIndex: 6, type: '' },
-                    { startIndex: 7, type: 'type.identifier.pebble' }, // 'PubKeyHash'
-                    { startIndex: 17, type: '' },
-                    { startIndex: 18, type: 'delimiter.pebble' }, // '='
-                    { startIndex: 19, type: '' },
-                    { startIndex: 20, type: 'identifier.pebble' }, // 'owner'
-                    { startIndex: 25, type: 'delimiter.pebble' } // ';'
-                ]
-            }
-        ],
-        // Operators
-        [
-            {
-                line: 'x = y + z - 10 * 2 / 5;',
-                tokens: [
-                    { startIndex: 0, type: 'identifier.pebble' }, // 'x'
-                    { startIndex: 1, type: '' }, // whitespace
-                    { startIndex: 2, type: 'delimiter.pebble' }, // '='
-                    { startIndex: 3, type: '' }, // whitespace
-                    { startIndex: 4, type: 'identifier.pebble' }, // 'y'
-                    { startIndex: 5, type: '' }, // whitespace
-                    { startIndex: 6, type: 'delimiter.pebble' }, // '+'
-                    { startIndex: 7, type: '' }, // whitespace
-                    { startIndex: 8, type: 'identifier.pebble' }, // 'z'
-                    { startIndex: 9, type: '' }, // whitespace
-                    { startIndex: 10, type: 'delimiter.pebble' }, // '-'
-                    { startIndex: 11, type: '' }, // whitespace
-                    { startIndex: 12, type: 'number.pebble' }, // '10'
-                    { startIndex: 14, type: '' }, // whitespace
-                    { startIndex: 15, type: 'delimiter.pebble' }, // '*'
-                    { startIndex: 16, type: '' }, // whitespace
-                    { startIndex: 17, type: 'number.pebble' }, // '2'
-                    { startIndex: 18, type: '' }, // whitespace
-                    { startIndex: 19, type: 'delimiter.pebble' }, // '/'
-                    { startIndex: 20, type: '' }, // whitespace
-                    { startIndex: 21, type: 'number.pebble' }, // '5'
-                    { startIndex: 22, type: 'delimiter.pebble' } // ';'
-                ]
-            }
-        ],
-        // Delimiters
-        [
-            {
-                line: '{ [ ( ) ] }',
-                tokens: [
-                    { startIndex: 0, type: 'delimiter.bracket.pebble' }, // '{'
-                    { startIndex: 1, type: '' }, // whitespace
-                    { startIndex: 2, type: 'delimiter.square.pebble' }, // '['
-                    { startIndex: 3, type: '' }, // whitespace
-                    { startIndex: 4, type: 'delimiter.parenthesis.pebble' }, // '('
-                    { startIndex: 5, type: '' }, // whitespace
-                    { startIndex: 6, type: 'delimiter.parenthesis.pebble' }, // ')'
-                    { startIndex: 7, type: '' }, // whitespace
-                    { startIndex: 8, type: 'delimiter.square.pebble' }, // ']'
-                    { startIndex: 9, type: '' }, // whitespace
-                    { startIndex: 10, type: 'delimiter.bracket.pebble' } // '}'
-                ]
-            }
-        ],
         // Comments
         [
             {
                 line: '// This is a single-line comment',
-                tokens: [
-                    { startIndex: 0, type: 'comment.pebble' } // Entire line
-                ]
+                tokens: [{ startIndex: 0, type: 'comment.pebble' }]
             },
             {
                 line: '/* This is a multi-line comment */',
-                tokens: [
-                    { startIndex: 0, type: 'comment.pebble' } // Entire line
-                ]
+                tokens: [{ startIndex: 0, type: 'comment.pebble' }]
             }
         ],
         // Strings
@@ -181,11 +199,11 @@ define(["require", "exports", "../test/testRunner"], function (require, exports,
                 line: 'let str = "Hello, world!";',
                 tokens: [
                     { startIndex: 0, type: 'keyword.pebble' }, // 'let'
-                    { startIndex: 3, type: '' }, // whitespace
+                    { startIndex: 3, type: '' },
                     { startIndex: 4, type: 'identifier.pebble' }, // 'str'
-                    { startIndex: 7, type: '' }, // whitespace
+                    { startIndex: 7, type: '' },
                     { startIndex: 8, type: 'delimiter.pebble' }, // '='
-                    { startIndex: 9, type: '' }, // whitespace
+                    { startIndex: 9, type: '' },
                     { startIndex: 10, type: 'string.pebble' }, // '"Hello, world!"'
                     { startIndex: 25, type: 'delimiter.pebble' } // ';'
                 ]
@@ -197,11 +215,11 @@ define(["require", "exports", "../test/testRunner"], function (require, exports,
                 line: 'const pi = 3.14;',
                 tokens: [
                     { startIndex: 0, type: 'keyword.pebble' }, // 'const'
-                    { startIndex: 5, type: '' }, // whitespace
-                    { startIndex: 6, type: 'identifier.pebble' }, // 'pi'
-                    { startIndex: 8, type: '' }, // whitespace
+                    { startIndex: 5, type: '' },
+                    { startIndex: 6, type: 'identifier.constant.pebble' }, // 'pi'
+                    { startIndex: 8, type: '' },
                     { startIndex: 9, type: 'delimiter.pebble' }, // '='
-                    { startIndex: 10, type: '' }, // whitespace
+                    { startIndex: 10, type: '' },
                     { startIndex: 11, type: 'number.float.pebble' }, // '3.14'
                     { startIndex: 15, type: 'delimiter.pebble' } // ';'
                 ]
@@ -222,24 +240,145 @@ define(["require", "exports", "../test/testRunner"], function (require, exports,
                 ]
             }
         ],
-        // Built-in type keywords
+        // v0.3.0 — state declaration
         [
             {
-                line: 'let a: bool = true;',
+                line: 'state Live {',
                 tokens: [
-                    { startIndex: 0, type: 'keyword.pebble' }, // 'let'
-                    { startIndex: 3, type: '' },
-                    { startIndex: 4, type: 'identifier.pebble' }, // 'a'
-                    { startIndex: 5, type: 'delimiter.pebble' }, // ':'
-                    { startIndex: 6, type: '' },
-                    { startIndex: 7, type: 'type.identifier.pebble' }, // 'bool'
+                    { startIndex: 0, type: 'keyword.pebble' }, // 'state'
+                    { startIndex: 5, type: '' },
+                    { startIndex: 6, type: 'type.identifier.pebble' }, // 'Live'
+                    { startIndex: 10, type: '' },
+                    { startIndex: 11, type: 'delimiter.bracket.pebble' } // '{'
+                ]
+            }
+        ],
+        // v0.3.0 — data struct declaration: `data` is a modifier, `struct` a keyword
+        [
+            {
+                line: 'data struct Order {',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.pebble' }, // 'data'
+                    { startIndex: 4, type: '' },
+                    { startIndex: 5, type: 'keyword.pebble' }, // 'struct'
                     { startIndex: 11, type: '' },
-                    { startIndex: 12, type: 'delimiter.pebble' }, // '='
+                    { startIndex: 12, type: 'type.identifier.pebble' }, // 'Order'
+                    { startIndex: 17, type: '' },
+                    { startIndex: 18, type: 'delimiter.bracket.pebble' } // '{'
+                ]
+            }
+        ],
+        // v0.3.0 — contract with parameters
+        [
+            {
+                line: 'contract OneShot {',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.pebble' }, // 'contract'
+                    { startIndex: 8, type: '' },
+                    { startIndex: 9, type: 'type.identifier.pebble' }, // 'OneShot'
+                    { startIndex: 16, type: '' },
+                    { startIndex: 17, type: 'delimiter.bracket.pebble' } // '{'
+                ]
+            }
+        ],
+        // v0.3.0 — match arm prefix `when`
+        [
+            {
+                line: 'when Some{ value }:',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.control.pebble' }, // 'when'
+                    { startIndex: 4, type: '' },
+                    { startIndex: 5, type: 'type.identifier.pebble' }, // 'Some'
+                    { startIndex: 9, type: 'delimiter.bracket.pebble' }, // '{'
+                    { startIndex: 10, type: '' },
+                    { startIndex: 11, type: 'identifier.pebble' }, // 'value'
+                    { startIndex: 16, type: '' },
+                    { startIndex: 17, type: 'delimiter.bracket.pebble' }, // '}'
+                    { startIndex: 18, type: 'delimiter.pebble' } // ':'
+                ]
+            }
+        ],
+        // v0.3.0 — using statement with dotted path
+        [
+            {
+                line: 'using { fromList } = std.array;',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.pebble' }, // 'using'
+                    { startIndex: 5, type: '' },
+                    { startIndex: 6, type: 'delimiter.bracket.pebble' }, // '{'
+                    { startIndex: 7, type: '' },
+                    { startIndex: 8, type: 'identifier.pebble' }, // 'fromList'
+                    { startIndex: 16, type: '' },
+                    { startIndex: 17, type: 'delimiter.bracket.pebble' }, // '}'
+                    { startIndex: 18, type: '' },
+                    { startIndex: 19, type: 'delimiter.pebble' }, // '='
+                    { startIndex: 20, type: '' },
+                    { startIndex: 21, type: 'identifier.pebble' }, // 'std'
+                    { startIndex: 24, type: 'delimiter.pebble' }, // '.'
+                    { startIndex: 25, type: 'identifier.pebble' }, // 'array'
+                    { startIndex: 30, type: 'delimiter.pebble' } // ';'
+                ]
+            }
+        ],
+        // v0.3.0 — `is Pattern` test in assert
+        [
+            {
+                line: 'assert opt is None;',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.control.pebble' }, // 'assert'
+                    { startIndex: 6, type: '' },
+                    { startIndex: 7, type: 'identifier.pebble' }, // 'opt'
+                    { startIndex: 10, type: '' },
+                    { startIndex: 11, type: 'keyword.control.pebble' }, // 'is'
                     { startIndex: 13, type: '' },
-                    { startIndex: 14, type: 'keyword.pebble' }, // 'true'
+                    { startIndex: 14, type: 'type.identifier.pebble' }, // 'None'
                     { startIndex: 18, type: 'delimiter.pebble' } // ';'
                 ]
             }
+        ],
+        // v0.3.0 — hex byte literal
+        [
+            {
+                line: 'const h: bytes = #deadbeef;',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.pebble' }, // 'const'
+                    { startIndex: 5, type: '' },
+                    { startIndex: 6, type: 'identifier.constant.pebble' }, // 'h'
+                    { startIndex: 7, type: 'delimiter.pebble' }, // ':'
+                    { startIndex: 8, type: '' },
+                    { startIndex: 9, type: 'type.identifier.pebble' }, // 'bytes'
+                    { startIndex: 14, type: '' },
+                    { startIndex: 15, type: 'delimiter.pebble' }, // '='
+                    { startIndex: 16, type: '' },
+                    { startIndex: 17, type: 'number.hex.pebble' }, // '#deadbeef'
+                    { startIndex: 26, type: 'delimiter.pebble' } // ';'
+                ]
+            }
+        ],
+        // v0.3.0 — generic type argument `List<int>`
+        [
+            {
+                line: 'function f(xs: List<int>): int {',
+                tokens: [
+                    { startIndex: 0, type: 'keyword.pebble' }, // 'function'
+                    { startIndex: 8, type: '' },
+                    { startIndex: 9, type: 'entity.name.function.pebble' }, // 'f'
+                    { startIndex: 10, type: 'delimiter.parenthesis.pebble' }, // '('
+                    { startIndex: 11, type: 'identifier.pebble' }, // 'xs'
+                    { startIndex: 13, type: 'delimiter.pebble' }, // ':'
+                    { startIndex: 14, type: '' },
+                    { startIndex: 15, type: 'type.identifier.pebble' }, // 'List'
+                    { startIndex: 19, type: 'delimiter.pebble' }, // '<'
+                    { startIndex: 20, type: 'type.identifier.pebble' }, // 'int'
+                    { startIndex: 23, type: 'delimiter.pebble' }, // '>'
+                    { startIndex: 24, type: 'delimiter.parenthesis.pebble' }, // ')'
+                    { startIndex: 25, type: 'delimiter.pebble' }, // ':'
+                    { startIndex: 26, type: '' },
+                    { startIndex: 27, type: 'type.identifier.pebble' }, // 'int'
+                    { startIndex: 30, type: '' },
+                    { startIndex: 31, type: 'delimiter.bracket.pebble' } // '{'
+                ]
+            }
         ]
     ]);
 });