lexgui 0.1.24 → 0.1.26

package/build/components/codeeditor.js

@@ -26,7 +26,12 @@ function sliceChars( str, idx, n = 1 ) {
 }
 
 function firstNonspaceIndex( str ) {
-    return str.search(/\S|$/);
+    const index = str.search(/\S|$/)
+    return index < str.length ? index : -1;
+}
+
+function strReverse( str ) {
+    return str.split( "" ).reverse().join( "" );
 }
 
 function indexOfFrom( str, reg, from, reverse ) {
@@ -63,16 +68,17 @@ function doAsync( fn, ms ) {
 
 class CodeSelection {
 
-    constructor( editor, ix, iy, className = "lexcodeselection" ) {
+    constructor( editor, cursor, className = "lexcodeselection" ) {
 
         this.editor = editor;
-        this.chars  = 0;
+        this.cursor = cursor;
         this.className = className;
+        this.chars  = 0;
 
-        this.fromX  = ix;
-        this.toX    = ix;
-        this.fromY  = iy;
-        this.toY    = iy;
+        this.fromX  = cursor.position;
+        this.toX    = cursor.position;
+        this.fromY  = cursor.line;
+        this.toY    = cursor.line;
     }
 
     sameLine() {
@@ -100,7 +106,7 @@ class CodeSelection {
         }
     }
 
-    selectInline( x, y, width ) {
+    selectInline( cursor, x, y, width, isSearchResult ) {
         
         this.chars = width / this.editor.charWidth;
         this.fromX = x;
@@ -115,10 +121,44 @@ class CodeSelection {
         domEl._left = x * this.editor.charWidth;
         domEl.style.left = "calc(" + domEl._left + "px + " + this.editor.xPadding + ")";
         domEl.style.width = width + "px";
-        this.editor.selections.appendChild(domEl);
+
+        if( isSearchResult )
+        {
+            this.editor.searchResultSelections.appendChild( domEl );
+        }
+        else
+        {
+            this.editor.selections[ cursor.name ].appendChild( domEl );
+        }
 
         // Hide active line background
-        this.editor.code.childNodes.forEach( e => e.classList.remove( 'active-line' ) );
+        this.editor._hideActiveLine();
+    }
+
+    save() {
+
+        return {
+            fromX: this.fromX,
+            fromY: this.fromY,
+            toX: this.toX,
+            toY: this.toY
+        }
+    }
+
+    load( data ) {
+
+        this.fromX = data.fromX;
+        this.fromY = data.fromY;
+        this.toX = data.toX;
+        this.toY = data.toY;
+    }
+
+    getText() {
+
+        if( !this.editor.code || !this.sameLine() )
+            return null;
+
+        return this.editor.code.lines[ this.fromY ].substring( this.fromX, this.toX );
     }
 };
 
@@ -140,6 +180,7 @@ class ScrollBar {
         this.thumb = document.createElement( 'div' );
         this.thumb._top = 0;
         this.thumb._left = 0;
+
         this.root.appendChild( this.thumb );
 
         this.thumb.addEventListener( "mousedown", inner_mousedown );
@@ -151,8 +192,8 @@ class ScrollBar {
         function inner_mousedown( e )
         {
             var doc = editor.root.ownerDocument;
-            doc.addEventListener( "mousemove",inner_mousemove );
-            doc.addEventListener( "mouseup",inner_mouseup );
+            doc.addEventListener( "mousemove", inner_mousemove );
+            doc.addEventListener( "mouseup", inner_mouseup );
             that.lastPosition.set( e.x, e.y );
             e.stopPropagation();
             e.preventDefault();
@@ -201,8 +242,8 @@ class CodeEditor {
     static WORD_TYPE_METHOD = 0;
     static WORD_TYPE_CLASS  = 1;
 
-    static CODE_MAX_FONT_SIZE = 22;
     static CODE_MIN_FONT_SIZE = 9;
+    static CODE_MAX_FONT_SIZE = 22;
 
     /**
      * @param {*} options
@@ -324,9 +365,13 @@ class CodeEditor {
         this.cursors.className = 'cursors';
         this.tabs.area.attach( this.cursors );
 
-        this.selections = document.createElement( 'div' );
-        this.selections.className = 'selections';
-        this.tabs.area.attach( this.selections );
+        this.searchResultSelections = document.createElement( 'div' );
+        this.searchResultSelections.id = 'search-selections';
+        this.searchResultSelections.className = 'selections';
+        this.tabs.area.attach( this.searchResultSelections );
+
+        // Store here selections per cursor
+        this.selections = {};
 
         // Css char synchronization
         this.xPadding = "48px";
@@ -493,7 +538,8 @@ class CodeEditor {
         this.state = {
             focused: false,
             selectingText: false,
-            activeLine: null
+            activeLine: null,
+            keyChain: null
         }
 
         // Code
@@ -550,90 +596,26 @@ class CodeEditor {
             'End', 'Tab', 'Escape'
         ];
 
-        this.keywords = {
-            'JavaScript': ['var', 'let', 'const', 'this', 'in', 'of', 'true', 'false', 'new', 'function', 'NaN', 'static', 'class', 'constructor', 'null', 'typeof', 'debugger', 'abstract',
-                          'arguments', 'extends', 'instanceof'],
-            'C++': ['int', 'float', 'double', 'bool', 'char', 'wchar_t', 'const', 'static_cast', 'dynamic_cast', 'new', 'delete', 'void', 'true', 'false', 'auto', 'struct', 'typedef', 'nullptr', 
-                    'NULL', 'unsigned', 'namespace'],
-            'JSON': ['true', 'false'],
-            'GLSL': ['true', 'false', 'function', 'int', 'float', 'vec2', 'vec3', 'vec4', 'mat2x2', 'mat3x3', 'mat4x4', 'struct'],
-            'CSS': ['body', 'html', 'canvas', 'div', 'input', 'span', '.'],
-            'WGSL': ['var', 'let', 'true', 'false', 'fn', 'bool', 'u32', 'i32', 'f16', 'f32', 'vec2f', 'vec3f', 'vec4f', 'mat2x2f', 'mat3x3f', 'mat4x4f', 'array', 'atomic', 'struct',
-                    'sampler', 'sampler_comparison', 'texture_depth_2d', 'texture_depth_2d_array', 'texture_depth_cube', 'texture_depth_cube_array', 'texture_depth_multisampled_2d',
-                    'texture_external', 'texture_1d', 'texture_2d', 'texture_2d_array', 'texture_3d', 'texture_cube', 'texture_cube_array', 'texture_storage_1d', 'texture_storage_2d',
-                    'texture_storage_2d_array', 'texture_storage_3d'],
-            'Rust': ['as', 'const', 'crate', 'enum', 'extern', 'false', 'fn', 'impl', 'in', 'let', 'mod', 'move', 'mut', 'pub', 'ref', 'self', 'Self', 'static', 'struct', 'super', 'trait', 'true', 
-                     'type', 'unsafe', 'use', 'where', 'abstract', 'become', 'box', 'final', 'macro', 'override', 'priv', 'typeof', 'unsized', 'virtual'],
-            'Python': ['False', 'def', 'None', 'True', 'in', 'is', 'and', 'lambda', 'nonlocal', 'not', 'or'],
-            'Batch': ['set', 'SET', 'echo', 'ECHO', 'off', 'OFF', 'del', 'DEL', 'defined', 'DEFINED', 'setlocal', 'SETLOCAL', 'enabledelayedexpansion', 'ENABLEDELAYEDEXPANSION', 'driverquery', 
-                      'DRIVERQUERY', 'print', 'PRINT'],
-            'HTML': ['html', 'meta', 'title', 'link', 'script', 'body', 'DOCTYPE', 'head', 'br', 'i', 'a', 'li', 'img', 'tr', 'td', 'h1', 'h2', 'h3', 'h4', 'h5'],
-            'Markdown': ['br', 'i', 'a', 'li', 'img', 'table', 'title', 'tr', 'td', 'h1', 'h2', 'h3', 'h4', 'h5'],
-        };
-        this.utils = { // These ones don't have hightlight, used as suggestions to autocomplete only...
-            'JavaScript': ['querySelector', 'body', 'addEventListener', 'removeEventListener', 'remove', 'sort', 'keys', 'filter', 'isNaN', 'parseFloat', 'parseInt', 'EPSILON', 'isFinite',
-                          'bind', 'prototype', 'length', 'assign', 'entries', 'values', 'concat', 'substring', 'substr', 'splice', 'slice', 'buffer', 'appendChild', 'createElement', 'prompt',
-                          'alert'],
-            'WGSL': ['textureSample'],
-            'Python': ['abs', 'all', 'any', 'ascii', 'bin', 'bool', 'bytearray', 'bytes', 'callable', 'chr', 'classmethod', 'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 
-                      'enumerate', 'eval', 'exec', 'filter', 'float', 'format', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help', 'hex', 'id', 'input', 'int', 'isinstance',
-                      'issubclass', 'iter', 'len', 'list', 'locals', 'map', 'max', 'memoryview', 'min', 'next', 'object', 'oct', 'open', 'ord', 'pow', 'print', 'property', 'range', 'repr', 
-                      'reversed', 'round', 'set', 'setattr', 'slice', 'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'vars', 'zip']
-        };
-        this.types = {
-            'JavaScript': ['Object', 'String', 'Function', 'Boolean', 'Symbol', 'Error', 'Number', 'TextEncoder', 'TextDecoder'],
-            'Rust': ['u128'],
-            'Python': ['int', 'type', 'float', 'map', 'list', 'ArithmeticError', 'AssertionError', 'AttributeError', 'Exception', 'EOFError', 'FloatingPointError', 'GeneratorExit', 
-                      'ImportError', 'IndentationError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'LookupError', 'MemoryError', 'NameError', 'NotImplementedError', 'OSError',
-                      'OverflowError', 'ReferenceError', 'RuntimeError', 'StopIteration', 'SyntaxError', 'TabError', 'SystemError', 'SystemExit', 'TypeError', 'UnboundLocalError', 
-                      'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError', 'UnicodeTranslateError', 'ValueError', 'ZeroDivisionError'],
-            'C++': ['uint8_t', 'uint16_t', 'uint32_t']
-        };
-        this.builtin = {
-            'JavaScript': ['document', 'console', 'window', 'navigator', 'performance'],
-            'CSS': ['*', '!important'],
-            'C++': ['vector', 'list', 'map'],
-            'HTML': ['type', 'xmlns', 'PUBLIC', 'http-equiv', 'src', 'style', 'lang', 'href', 'rel', 'content', 'xml', 'alt'], // attributes
-            'Markdown': ['type', 'src', 'style', 'lang', 'href', 'rel', 'content', 'valign', 'alt'], // attributes
-        };
-        this.statementsAndDeclarations = {
-            'JavaScript': ['for', 'if', 'else', 'case', 'switch', 'return', 'while', 'continue', 'break', 'do', 'import', 'from', 'throw', 'async', 'try', 'catch', 'await'],
-            'CSS': ['@', 'import'],
-            'C++': ['std', 'for', 'if', 'else', 'return', 'continue', 'break', 'case', 'switch', 'while', 'using', 'glm', 'spdlog'],
-            'GLSL': ['for', 'if', 'else', 'return', 'continue', 'break'],
-            'WGSL': ['const','for', 'if', 'else', 'return', 'continue', 'break', 'storage', 'read', 'uniform'],
-            'Rust': ['break', 'else', 'continue', 'for', 'if', 'loop', 'match', 'return', 'while', 'do', 'yield'],
-            'Python': ['if', 'raise', 'del', 'import', 'return', 'elif', 'try', 'else', 'while', 'as', 'except', 'with', 'assert', 'finally', 'yield', 'break', 'for', 'class', 'continue', 
-                      'global', 'pass'],
-            'Batch': ['if', 'IF', 'for', 'FOR', 'in', 'IN', 'do', 'DO', 'call', 'CALL', 'goto', 'GOTO', 'exit', 'EXIT']
-        };
-        this.symbols = {
-            'JavaScript': ['<', '>', '[', ']', '{', '}', '(', ')', ';', '=', '|', '||', '&', '&&', '?', '??'],
-            'C++': ['<', '>', '[', ']', '{', '}', '(', ')', ';', '=', '|', '||', '&', '&&', '?', '::', '*', '-', '+'],
-            'JSON': ['[', ']', '{', '}', '(', ')'],
-            'GLSL': ['[', ']', '{', '}', '(', ')'],
-            'WGSL': ['[', ']', '{', '}', '(', ')', '->'],
-            'CSS': ['{', '}', '(', ')', '*'],
-            'Rust': ['<', '>', '[', ']', '(', ')', '='],
-            'Python': ['<', '>', '[', ']', '(', ')', '='],
-            'Batch': ['[', ']', '(', ')', '%'],
-            'HTML': ['<', '>', '/']
-        };
+        this._blockCommentCache = [];
 
         // Convert reserved word arrays to maps so we can search tokens faster
 
-        for( let lang in this.keywords ) this.keywords[lang] = this.keywords[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
-        for( let lang in this.utils ) this.utils[lang] = this.utils[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
-        for( let lang in this.types ) this.types[lang] = this.types[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
-        for( let lang in this.builtin ) this.builtin[lang] = this.builtin[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
-        for( let lang in this.statementsAndDeclarations ) this.statementsAndDeclarations[lang] = this.statementsAndDeclarations[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
-        for( let lang in this.symbols ) this.symbols[lang] = this.symbols[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
+        for( let lang in CodeEditor.keywords ) CodeEditor.keywords[lang] = CodeEditor.keywords[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
+        for( let lang in CodeEditor.utils ) CodeEditor.utils[lang] = CodeEditor.utils[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
+        for( let lang in CodeEditor.types ) CodeEditor.types[lang] = CodeEditor.types[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
+        for( let lang in CodeEditor.builtin ) CodeEditor.builtin[lang] = CodeEditor.builtin[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
+        for( let lang in CodeEditor.statementsAndDeclarations ) CodeEditor.statementsAndDeclarations[lang] = CodeEditor.statementsAndDeclarations[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
+        for( let lang in CodeEditor.symbols ) CodeEditor.symbols[lang] = CodeEditor.symbols[lang].reduce((a, v) => ({ ...a, [v]: true}), {});
 
         // Action keys
 
         this.action( 'Escape', false, ( ln, cursor, e ) => {
-            this.hideAutoCompleteBox();
-            this.hideSearchBox();
+            if( this.hideAutoCompleteBox() )
+                return;
+            if( this.hideSearchBox() )
+                return;
+            // Remove selections and cursors
+            this.endSelection();
             this._removeSecondaryCursors();
         });
 
@@ -641,7 +623,7 @@ class CodeEditor {
 
             this._addUndoStep( cursor );
 
-            if( this.selection ) {
+            if( cursor.selection ) {
                 this.deleteSelection( cursor );
                 // Remove entire line when selecting with triple click
                 if( this._tripleClickSelection ) 
@@ -695,7 +677,7 @@ class CodeEditor {
 
             this._addUndoStep( cursor );
             
-            if(this.selection) {
+            if( cursor.selection ) {
                 // Use 'Backspace' as it's the same callback...
                 this.actions['Backspace'].callback( ln, cursor, e );
             }
@@ -706,7 +688,7 @@ class CodeEditor {
                     this.code.lines[ ln ] = sliceChars( this.code.lines[ ln ], cursor.position );
                     this.processLine( ln );
                 } 
-                else if(this.code.lines[ ln + 1 ] != undefined) {
+                else if( this.code.lines[ ln + 1 ] != undefined ) {
                     this.code.lines[ ln ] += this.code.lines[ ln + 1 ];
                     this.code.lines.splice( ln + 1, 1 );
                     this.processLines();
@@ -745,18 +727,18 @@ class CodeEditor {
             if( e.shiftKey && !e.cancelShift )
             {
                 // Get last selection range
-                if( this.selection ) 
-                    lastX += this.selection.chars;
+                if( cursor.selection ) 
+                    lastX += cursor.selection.chars;
 
-                if( !this.selection )
+                if( !cursor.selection )
                     this.startSelection( cursor );
 
                 var string = this.code.lines[ ln ].substring( idx, lastX );
-                if( this.selection.sameLine() )
-                    this.selection.selectInline( idx, cursor.line, this.measureString( string ) );
+                if( cursor.selection.sameLine() )
+                    cursor.selection.selectInline( cursor, idx, cursor.line, this.measureString( string ) );
                 else
                 {
-                    this.processSelection( e );
+                    this._processSelection( cursor, e );
                 }
             } else if( !e.keepSelection )
                 this.endSelection();
@@ -767,15 +749,15 @@ class CodeEditor {
             if( ( e.shiftKey || e._shiftKey ) && !e.cancelShift ) {
                 
                 var string = this.code.lines[ ln ].substring( cursor.position );
-                if( !this.selection )
+                if( !cursor.selection )
                     this.startSelection( cursor );
-                if( this.selection.sameLine() )
-                    this.selection.selectInline(cursor.position, cursor.line, this.measureString( string ));
+                if( cursor.selection.sameLine() )
+                    cursor.selection.selectInline( cursor, cursor.position, cursor.line, this.measureString( string ));
                 else
                 {
                     this.resetCursorPos( CodeEditor.CURSOR_LEFT, cursor );
                     this.cursorToString( cursor, this.code.lines[ ln ] );            
-                    this.processSelection( e );
+                    this._processSelection( cursor, e );
                 }
             } else if( !e.keepSelection )
                 this.endSelection();
@@ -837,7 +819,7 @@ class CodeEditor {
             if( !this.isAutoCompleteActive )
             {
                 if( e.shiftKey ) {
-                    if( !this.selection )
+                    if( !cursor.selection )
                         this.startSelection( cursor );
 
                     this.lineUp( cursor );
@@ -847,7 +829,7 @@ class CodeEditor {
                         this.cursorToPosition( cursor, this.code.lines[ cursor.line ].length );
                     }
                     
-                    this.processSelection( e, false );
+                    this._processSelection( cursor, e, false );
 
                 } else {
                     this.endSelection();
@@ -870,7 +852,7 @@ class CodeEditor {
             if( !this.isAutoCompleteActive )
             {
                 if( e.shiftKey ) {
-                    if( !this.selection )
+                    if( !cursor.selection )
                         this.startSelection( cursor );
                 } else {
                     this.endSelection();
@@ -881,11 +863,11 @@ class CodeEditor {
 
                 // Go to end of line if out of range
                 if( !letter || !canGoDown ) {
-                    this.actions[ 'End' ].callback( cursor.line, cursor, e );
+                    this.cursorToPosition( cursor, Math.max(this.code.lines[ cursor.line ].length, 0) );
                 }
 
                 if( e.shiftKey ) {
-                    this.processSelection( e );
+                    this._processSelection( cursor, e );
                 }
             } 
             // Move down autocomplete selection
@@ -919,37 +901,37 @@ class CodeEditor {
                 var diff = Math.max( cursor.position - from, 1 );
                 var substr = word.substr( 0, diff );
                 // Selections...
-                if( e.shiftKey ) { if( !this.selection ) this.startSelection( cursor ); }
+                if( e.shiftKey ) { if( !cursor.selection ) this.startSelection( cursor ); }
                 else this.endSelection();
                 this.cursorToString( cursor, substr, true );
-                if( e.shiftKey ) this.processSelection( e, false, true );
+                if( e.shiftKey ) this._processSelection( cursor, e, false, true );
             }
             else {
                 var letter = this.getCharAtPos( cursor, -1 );
                 if( letter ) {
                     if( e.shiftKey ) {
-                        if( !this.selection ) this.startSelection( cursor );
+                        if( !cursor.selection ) this.startSelection( cursor );
                         this.cursorToLeft( letter, cursor );
-                        this.processSelection( e, false, CodeEditor.SELECTION_X );
+                        this._processSelection( cursor, e, false, CodeEditor.SELECTION_X );
                     }
                     else {
-                        if( !this.selection ) {
+                        if( !cursor.selection ) {
                             this.cursorToLeft( letter, cursor );
                             if( this.useAutoComplete && this.isAutoCompleteActive )
                                 this.showAutoCompleteBox( 'foo', cursor );
                         }
                         else {
-                            this.selection.invertIfNecessary();
+                            cursor.selection.invertIfNecessary();
                             this.resetCursorPos( CodeEditor.CURSOR_LEFT | CodeEditor.CURSOR_TOP, cursor );
-                            this.cursorToLine( cursor, this.selection.fromY, true );
-                            this.cursorToPosition( cursor, this.selection.fromX );
+                            this.cursorToLine( cursor, cursor.selection.fromY, true );
+                            this.cursorToPosition( cursor, cursor.selection.fromX );
                             this.endSelection();
                         }
                     }
                 }
                 else if( cursor.line > 0 ) {
                     
-                    if( e.shiftKey && !this.selection ) this.startSelection( cursor );
+                    if( e.shiftKey && !cursor.selection ) this.startSelection( cursor );
                         
                     this.lineUp( cursor );
 
@@ -957,7 +939,7 @@ class CodeEditor {
                     this.actions[ 'End' ].callback( cursor.line, cursor, e );
                     delete e.cancelShift; delete e.keepSelection;
 
-                    if( e.shiftKey ) this.processSelection( e, false );
+                    if( e.shiftKey ) this._processSelection( cursor, e, false );
                 }
             }
         });
@@ -969,40 +951,61 @@ class CodeEditor {
                 cursor.position == this.code.lines[ cursor.line ].length )
             return;
 
-            if( e.metaKey ) { // Apple devices (Command)
+            if( e.metaKey ) // Apple devices (Command)
+            {
                 e.preventDefault();
                 this.actions[ 'End' ].callback( ln, cursor );
-            } else if( e.ctrlKey ) {
+            }
+            else if( e.ctrlKey ) // Next word
+            {
                 // Get next word
                 const [ word, from, to ] = this.getWordAtPos( cursor );
+
                 // If no length, we change line..
                 if( !word.length ) this.lineDown( cursor, true );
                 var diff = cursor.position - from;
                 var substr = word.substr( diff );
+
                 // Selections...
-                if( e.shiftKey ) { if( !this.selection ) this.startSelection( cursor ); }
-                else this.endSelection();
+                if( e.shiftKey ) {
+                    if( !cursor.selection )
+                        this.startSelection( cursor );
+                }
+                else
+                    this.endSelection();
+
                 this.cursorToString( cursor, substr );
-                if( e.shiftKey ) this.processSelection( e );
-            } else {
+
+                if( e.shiftKey )
+                    this._processSelection( cursor, e );
+            }
+            else // Next char
+            {
                 var letter = this.getCharAtPos( cursor );
                 if( letter ) {
-                    if( e.shiftKey ) {
-                        if( !this.selection ) this.startSelection( cursor );
+
+                    // Selecting chars
+                    if( e.shiftKey )
+                    {
+                        if( !cursor.selection )
+                            this.startSelection( cursor );
+
                         this.cursorToRight( letter, cursor );
-                        this.processSelection( e, false, CodeEditor.SELECTION_X );
-                    }else{
-                        if( !this.selection ) {
+                        this._processSelection( cursor, e, false, CodeEditor.SELECTION_X );
+                    }
+                    else
+                    {
+                        if( !cursor.selection ) {
                             this.cursorToRight( letter, cursor );
                             if( this.useAutoComplete && this.isAutoCompleteActive )
                                 this.showAutoCompleteBox( 'foo', cursor );
                         }
-                        else 
+                        else
                         {
-                            this.selection.invertIfNecessary();
+                            cursor.selection.invertIfNecessary();
                             this.resetCursorPos( CodeEditor.CURSOR_LEFT | CodeEditor.CURSOR_TOP, cursor );
-                            this.cursorToLine( cursor, this.selection.toY );
-                            this.cursorToPosition( cursor, this.selection.toX );
+                            this.cursorToLine( cursor, cursor.selection.toY );
+                            this.cursorToPosition( cursor, cursor.selection.toX );
                             this.endSelection();
                         }
                     }
@@ -1010,12 +1013,13 @@ class CodeEditor {
                 else if( this.code.lines[ cursor.line + 1 ] !== undefined ) {
                     
                     if( e.shiftKey ) {
-                        if( !this.selection ) this.startSelection( cursor );
+                        if( !cursor.selection ) this.startSelection( cursor );
                     }
+                    else this.endSelection();
 
                     this.lineDown( cursor, true );
                     
-                    if( e.shiftKey ) this.processSelection( e, false );
+                    if( e.shiftKey ) this._processSelection( cursor, e, false );
 
                     this.hideAutoCompleteBox();
                 }
@@ -1115,14 +1119,14 @@ class CodeEditor {
 
         let lidx = cursor.line;
 
-        if( this.selection ) {
+        if( cursor.selection ) {
             this.deleteSelection( cursor );
             lidx = cursor.line;
         }
 
         this.endSelection();
 
-        const new_lines = text.split( '\n' );
+        const new_lines = text.replaceAll( '\r', '' ).split( '\n' );
 
         // Pasting Multiline...
         if( new_lines.length != 1 )
@@ -1177,10 +1181,16 @@ class CodeEditor {
 
         const inner_add_tab = ( text, name, title ) => {
 
+            // Remove Carriage Return in some cases and sub tabs using spaces
+            text = text.replaceAll( '\r', '' );
+            text = text.replaceAll( /\t|\\t/g, ' '.repeat( this.tabSpaces ) );
+
             // Set current text and language
-            const lines = text.replaceAll( '\r', '' ).split( '\n' );
+
+            const lines = text.split( '\n' );
 
             // Add item in the explorer if used
+
             if( this.explorer )
             {
                 this._storedLines = this._storedLines ?? {};
@@ -1227,8 +1237,9 @@ class CodeEditor {
 
             return;
         }
-
+         
         let cursor = document.createElement( 'div' );
+        cursor.name = "cursor" + this.cursors.childElementCount;
         cursor.className = "cursor";
         cursor.innerHTML = "&nbsp;";
         cursor.isMain = isMain;
@@ -1348,6 +1359,8 @@ class CodeEditor {
 
             this.restoreCursor( currentCursor, step.cursors[ i ] );
         }
+
+        this._hideActiveLine();
     }
 
     _addRedoStep( cursor )  {
@@ -1703,12 +1716,12 @@ class CodeEditor {
             {
                 this.processClick( e );
 
-                this.canOpenContextMenu = !this.selection;
+                this.canOpenContextMenu = !cursor.selection;
 
-                if( this.selection )
+                if( cursor.selection )
                 {
-                    this.canOpenContextMenu |= (cursor.line >= this.selection.fromY && cursor.line <= this.selection.toY 
-                                                && cursor.position >= this.selection.fromX && cursor.position <= this.selection.toX);
+                    this.canOpenContextMenu |= (cursor.line >= cursor.selection.fromY && cursor.line <= cursor.selection.toY 
+                                                && cursor.position >= cursor.selection.fromX && cursor.position <= cursor.selection.toX);
                     if( this.canOpenContextMenu )
                         return;
                 }
@@ -1728,7 +1741,7 @@ class CodeEditor {
         else if( e.type == 'mousemove' )
         {
             if( this.state.selectingText )
-                this.processSelection( e );
+                this.processSelections( e );
         }
 
         else if ( e.type == 'click' ) // trip
@@ -1740,7 +1753,7 @@ class CodeEditor {
                     this.resetCursorPos( CodeEditor.CURSOR_LEFT, cursor );
                     this.cursorToPosition( cursor, from );
                     this.startSelection( cursor );
-                    this.selection.selectInline( from, cursor.line, this.measureString( word ) );
+                    cursor.selection.selectInline( cursor, from, cursor.line, this.measureString( word ) );
                     this.cursorToString( cursor, word ); // Go to the end of the word
                     break;
                 // Select entire line
@@ -1769,6 +1782,8 @@ class CodeEditor {
                     m.add( "" );
                     m.add( "Format/JSON", () => { 
                         let json = this.toJSONFormat( this.getText() );
+                        if( !json )
+                            return;
                         this.code.lines = json.split( "\n" ); 
                         this.processLines();
                     } );
@@ -1786,10 +1801,9 @@ class CodeEditor {
             this.endSelection();
         }
 
-        if( this.selection )
-        {
-            this.selection.invertIfNecessary();
-        }
+        const cursor = this._getCurrentCursor();
+        if( cursor.selection )
+            cursor.selection.invertIfNecessary();
 
         this.state.selectingText = false;
         delete this._lastSelectionKeyDir;
@@ -1828,17 +1842,35 @@ class CodeEditor {
         this.hideAutoCompleteBox();
     }
 
-    processSelection( e, keep_range, flags = CodeEditor.SELECTION_X_Y ) {
+    updateSelections( e, keep_range, flags = CodeEditor.SELECTION_X_Y ) {
+
+        for( let cursor of this.cursors.children )
+        {
+            if( !cursor.selection )
+                continue;
+
+            this._processSelection( cursor, e, keep_range, flags );
+        }
+    }
+
+    processSelections( e, keep_range, flags = CodeEditor.SELECTION_X_Y ) {
+
+        for( let cursor of this.cursors.children )
+        {
+            this._processSelection( cursor, e, keep_range, flags );
+        }
+    }
+
+    _processSelection( cursor, e, keep_range, flags = CodeEditor.SELECTION_X_Y ) {
 
-        var cursor = this._getCurrentCursor();
         const isMouseEvent = e && ( e.constructor == MouseEvent );
 
         if( isMouseEvent ) this.processClick( e );
-        if( !this.selection )
+
+        if( !cursor.selection )
             this.startSelection( cursor );
 
-        // Hide active line background
-        this.code.childNodes.forEach( e => e.classList.remove( 'active-line' ) );
+        this._hideActiveLine();
 
         // Update selection
         if( !keep_range )
@@ -1846,46 +1878,48 @@ class CodeEditor {
             let ccw = true;
 
             // Check if we must change ccw or not ... (not with mouse)
-            if( !isMouseEvent && this.line >= this.selection.fromY && 
-                (this.line == this.selection.fromY ? this.position >= this.selection.fromX : true) )
+            if( !isMouseEvent && this.line >= cursor.selection.fromY && 
+                (this.line == cursor.selection.fromY ? this.position >= cursor.selection.fromX : true) )
             {
                 ccw = ( e && this._lastSelectionKeyDir && ( e.key == 'ArrowRight' || e.key == 'ArrowDown' || e.key == 'End' ) );
             }
 
             if( ccw )
             {
-                if( flags & CodeEditor.SELECTION_X ) this.selection.fromX = cursor.position;
-                if( flags & CodeEditor.SELECTION_Y ) this.selection.fromY = cursor.line;
+                if( flags & CodeEditor.SELECTION_X ) cursor.selection.fromX = cursor.position;
+                if( flags & CodeEditor.SELECTION_Y ) cursor.selection.fromY = cursor.line;
             }
             else
             {
-                if( flags & CodeEditor.SELECTION_X ) this.selection.toX = cursor.position;
-                if( flags & CodeEditor.SELECTION_Y ) this.selection.toY = cursor.line;
+                if( flags & CodeEditor.SELECTION_X ) cursor.selection.toX = cursor.position;
+                if( flags & CodeEditor.SELECTION_Y ) cursor.selection.toY = cursor.line;
             }
 
             this._lastSelectionKeyDir = ccw;
         }
 
         // Only leave if not a mouse selection...
-        if( !isMouseEvent && this.selection.isEmpty() )
+        if( !isMouseEvent && cursor.selection.isEmpty() )
         {
             this.endSelection();
             return;
         }
 
-        this.selection.chars = 0;
+        cursor.selection.chars = 0;
 
-        const fromX = this.selection.fromX,
-                fromY = this.selection.fromY,
-                toX = this.selection.toX,
-                toY = this.selection.toY;
+        const fromX = cursor.selection.fromX,
+                fromY = cursor.selection.fromY,
+                toX = cursor.selection.toX,
+                toY = cursor.selection.toY;
         const deltaY = toY - fromY;
 
+        let cursorSelections = this.selections[ cursor.name ];
+
         // Selection goes down...
         if( deltaY >= 0 )
         {
-            while( deltaY < ( this.selections.childElementCount - 1 ) )
-                deleteElement( this.selections.lastChild );
+            while( deltaY < ( cursorSelections.childElementCount - 1 ) )
+                deleteElement( cursorSelections.lastChild );
 
             for(let i = fromY; i <= toY; i++){
 
@@ -1896,12 +1930,12 @@ class CodeEditor {
                 if( isVisible )
                 {
                     // Make sure that the line selection is generated...
-                    domEl = this.selections.childNodes[ sId ];
+                    domEl = cursorSelections.childNodes[ sId ];
                     if(!domEl)
                     {
                         domEl = document.createElement( 'div' );
                         domEl.className = "lexcodeselection";
-                        this.selections.appendChild( domEl );
+                        cursorSelections.appendChild( domEl );
                     }
                 }
 
@@ -1923,7 +1957,7 @@ class CodeEditor {
                 }
                 
                 const stringWidth = this.measureString( string );
-                this.selection.chars += stringWidth / this.charWidth;
+                cursor.selection.chars += stringWidth / this.charWidth;
 
                 if( isVisible )
                 {
@@ -1935,8 +1969,8 @@ class CodeEditor {
         }
         else // Selection goes up...
         {
-            while( Math.abs( deltaY ) < ( this.selections.childElementCount - 1 ) )            
-                deleteElement( this.selections.firstChild );
+            while( Math.abs( deltaY ) < ( cursorSelections.childElementCount - 1 ) )
+                deleteElement( cursorSelections.firstChild );
 
             for( let i = toY; i <= fromY; i++ ){
 
@@ -1947,12 +1981,12 @@ class CodeEditor {
                 if( isVisible )
                 {
                     // Make sure that the line selection is generated...
-                    domEl = this.selections.childNodes[ sId ];
+                    domEl = cursorSelections.childNodes[ sId ];
                     if(!domEl)
                     {
                         domEl = document.createElement( 'div' );
                         domEl.className = "lexcodeselection";
-                        this.selections.appendChild( domEl );
+                        cursorSelections.appendChild( domEl );
                     }
                 }
 
@@ -1972,7 +2006,7 @@ class CodeEditor {
                 }
                 
                 const stringWidth = this.measureString( string );
-                this.selection.chars += stringWidth / this.charWidth;
+                cursor.selection.chars += stringWidth / this.charWidth;
                 
                 if( isVisible )
                 {
@@ -1994,14 +2028,21 @@ class CodeEditor {
         const key = e.key ?? e.detail.key;
         const target = e.detail.targetCursor;
 
+        // Global keys
+
+        if( this._processGlobalKeys( e, key ) ) {
+            // Stop propagation..
+            return;
+        }
+
+        // By cursor keys
+
         if( target !== undefined )
         {
             this.processKeyAtTargetCursor( e, key, target );
             return;
         }
 
-        // By cursor keys
-
         this._lastProcessedCursorIndex = null;
 
         var lastProcessedCursor = null;
@@ -2033,10 +2074,6 @@ class CodeEditor {
             cursorOffset.y += ( cursor.line - lastProcessedCursor.line );
         }
 
-        // Global keys
-
-        this._processGlobalKeys( e, key );
-
         // Clear tmp
 
         delete this._lastProcessedCursorIndex;
@@ -2054,41 +2091,72 @@ class CodeEditor {
         this._processGlobalKeys( e, key );
     }
 
-    async _processGlobalKeys( e, key ) {
+    _processGlobalKeys( e, key ) {
 
         let cursor = this._getCurrentCursor();
 
         if( e.ctrlKey || e.metaKey )
         {
-            e.preventDefault();
-
             switch( key.toLowerCase() ) {
             case 'a': // select all
+                e.preventDefault();
                 this.selectAll();
-                break;
+                return true;
+            case 'c': // k+c, comment line
+                e.preventDefault();
+                if( this.state.keyChain == 'k' ) {
+                    this._commentLines();
+                    return true;
+                }
+                return false;
+            case 'd': // next ocurrence
+                e.preventDefault();
+                this.selectNextOcurrence( cursor );
+                return true;
             case 'f': // find/search
+                e.preventDefault();
                 this.showSearchBox();
-                break;
+                return true;
             case 'g': // find line
+                e.preventDefault();
                 this.showSearchLineBox();
-                break;
+                return true;
+            case 'k': // shortcut chain
+                e.preventDefault();
+                this.state.keyChain = 'k';
+                return true;
             case 's': // save
+                e.preventDefault();
                 this.onsave( this.getText() );
-                break;
+                return true;
+            case 'u': // k+u, uncomment line
+                e.preventDefault();
+                if( this.state.keyChain == 'k' ) {
+                    this._uncommentLines();
+                    return true;
+                }
+                return false;
             case 'y': // redo
+                e.preventDefault();
                 this._doRedo( cursor );
-                break;
+                return true;
             case 'z': // undo
+                e.preventDefault();
                 this._doUndo( cursor );
-                break;
+                return true;
             case '+': // increase size
+                e.preventDefault();
                 this._increaseFontSize();
-                break;
+                return true;
             case '-': // decrease size
+                e.preventDefault();
                 this._decreaseFontSize();
-                break;
+                return true;
             }
         }
+
+        this.state.keyChain = null;
+        return false;
     }
 
     async _processKeyAtCursor( e, key, cursor ) {
@@ -2110,14 +2178,8 @@ class CodeEditor {
         {
             switch( key.toLowerCase() ) {
             case 'c': // copy
-                // TODO: COPY TEXT FROM EVERY CURSOR
                 this._copyContent( cursor );
                 return;
-            case 'd': // duplicate line
-                e.preventDefault();
-                // TODO: UPDATE NEXT CURSOR ON MODIFY STATE
-                this._duplicateLine( lidx, cursor );
-                return;
             case 'v': // paste
                 this._pasteContent( cursor );
                 return;
@@ -2138,6 +2200,10 @@ class CodeEditor {
         else if( e.altKey )
         {
             switch( key ) {
+                case 'd': // duplicate line
+                e.preventDefault();
+                this._duplicateLine( lidx, cursor );
+                return;
                 case 'ArrowUp':
                 if(this.code.lines[ lidx - 1 ] == undefined)
                     return;
@@ -2168,7 +2234,7 @@ class CodeEditor {
             if( key != actKey ) continue;
             e.preventDefault();
 
-            if( this.actions[ key ].deleteSelection && this.selection )
+            if( this.actions[ key ].deleteSelection && cursor.selection )
                 this.actions['Backspace'].callback( lidx, cursor, e );
 
             return this.actions[ key ].callback( lidx, cursor, e );
@@ -2197,7 +2263,7 @@ class CodeEditor {
         // Until this point, if there was a selection, we need 
         // to delete the content..
 
-        if( this.selection )
+        if( cursor.selection )
         {
             this.actions['Backspace'].callback( lidx, cursor, e );
             lidx = cursor.line;
@@ -2258,22 +2324,32 @@ class CodeEditor {
 
         let text = await navigator.clipboard.readText();
 
+        // Remove any possible tabs (\t) and add spaces
+        text = text.replaceAll( /\t|\\t/g, ' '.repeat( this.tabSpaces ) );
+
         this._addUndoStep( cursor, true );
 
         this.appendText( text, cursor );
+
+        const currentScroll = this.getScrollTop();
+        const scroll = Math.max( cursor.line * this.lineHeight - this.codeScroller.offsetWidth, 0 );
+
+        if( currentScroll < scroll ) {
+            this.codeScroller.scrollTo( 0, cursor.line * this.lineHeight );
+        }
     }
 
     async _copyContent( cursor ) {
 
         let text_to_copy = "";
 
-        if( !this.selection ) {
+        if( !cursor.selection ) {
             text_to_copy = "\n" + this.code.lines[ cursor.line ];
         }
         else {
             
             // Some selections don't depend on mouse up..
-            if( this.selection ) this.selection.invertIfNecessary();
+            if( cursor.selection ) cursor.selection.invertIfNecessary();
 
             const separator = "_NEWLINE_";
             let code = this.code.lines.join( separator );
@@ -2281,11 +2357,11 @@ class CodeEditor {
             // Get linear start index
             let index = 0;
             
-            for( let i = 0; i <= this.selection.fromY; i++ )
-                index += ( i == this.selection.fromY ? this.selection.fromX : this.code.lines[ i ].length );
+            for( let i = 0; i <= cursor.selection.fromY; i++ )
+                index += ( i == cursor.selection.fromY ? cursor.selection.fromX : this.code.lines[ i ].length );
 
-            index += this.selection.fromY * separator.length; 
-            const num_chars = this.selection.chars + ( this.selection.toY - this.selection.fromY ) * separator.length;
+            index += cursor.selection.fromY * separator.length; 
+            const num_chars = cursor.selection.chars + ( cursor.selection.toY - cursor.selection.fromY ) * separator.length;
             const text = code.substr( index, num_chars );
             const lines = text.split( separator );
             text_to_copy = lines.join('\n');
@@ -2301,7 +2377,7 @@ class CodeEditor {
 
         this._addUndoStep( cursor, true );
 
-        if( !this.selection ) {
+        if( !cursor.selection ) {
             text_to_cut = "\n" + this.code.lines[ cursor.line ];
             this.code.lines.splice( lidx, 1 );
             this.processLines();
@@ -2312,7 +2388,7 @@ class CodeEditor {
         else {
             
             // Some selections don't depend on mouse up..
-            if( this.selection ) this.selection.invertIfNecessary();
+            if( cursor.selection ) cursor.selection.invertIfNecessary();
 
             const separator = "_NEWLINE_";
             let code = this.code.lines.join(separator);
@@ -2320,11 +2396,11 @@ class CodeEditor {
             // Get linear start index
             let index = 0;
             
-            for(let i = 0; i <= this.selection.fromY; i++)
-                index += (i == this.selection.fromY ? this.selection.fromX : this.code.lines[ i ].length);
+            for(let i = 0; i <= cursor.selection.fromY; i++)
+                index += (i == cursor.selection.fromY ? cursor.selection.fromX : this.code.lines[ i ].length);
 
-            index += this.selection.fromY * separator.length; 
-            const num_chars = this.selection.chars + (this.selection.toY - this.selection.fromY) * separator.length;
+            index += cursor.selection.fromY * separator.length; 
+            const num_chars = cursor.selection.chars + (cursor.selection.toY - cursor.selection.fromY) * separator.length;
             const text = code.substr(index, num_chars);
             const lines = text.split(separator);
             text_to_cut = lines.join('\n');
@@ -2345,6 +2421,114 @@ class CodeEditor {
         this.hideAutoCompleteBox();
     }
 
+    _commentLines() {
+
+        this.state.keyChain = null;
+
+        if( cursor.selection )
+        {
+            var cursor = this._getCurrentCursor();
+            this._addUndoStep( cursor, true );
+
+            const selectedLines = this.code.lines.slice( cursor.selection.fromY, cursor.selection.toY );
+            const minIdx = Math.min(...selectedLines.map( v => {
+                var idx = firstNonspaceIndex( v );
+                return idx < 0 ? 1e10 : idx;
+            } ));
+
+            for( var i = cursor.selection.fromY; i <= cursor.selection.toY; ++i )
+            {
+                this._commentLine( cursor, i, minIdx );
+            }
+        }
+        else
+        {
+            for( let cursor of this.cursors.children )
+            {
+                this._addUndoStep( cursor, true );
+                this._commentLine( cursor, cursor.line );
+            }
+        }
+
+        this.processLines();
+        this._hideActiveLine();
+    }
+
+    _commentLine( cursor, line, minNonspaceIdx ) {
+
+        const lang = this.languages[ this.highlight ];
+
+        if( !( lang.singleLineComments ?? true ))
+            return;
+
+        const token = ( lang.singleLineCommentToken ?? this.defaultSingleLineCommentToken ) + ' ';
+        const string = this.code.lines[ line ];
+
+        let idx = firstNonspaceIndex( string );
+        if( idx > -1 )
+        {
+            // Update idx using min of the selected lines (if necessary..)
+            idx = minNonspaceIdx ?? idx;
+
+            this.code.lines[ line ] = [
+                string.substring( 0, idx ),
+                token,
+                string.substring( idx )
+            ].join( '' );
+
+            this.cursorToString( cursor, token );
+        }
+    }
+
+    _uncommentLines() {
+
+        this.state.keyChain = null;
+
+        if( cursor.selection )
+        {
+            var cursor = this._getCurrentCursor();
+            this._addUndoStep( cursor, true );
+
+            for( var i = cursor.selection.fromY; i <= cursor.selection.toY; ++i )
+            {
+                this._uncommentLine( cursor, i );
+            }
+        }
+        else
+        {
+            for( let cursor of this.cursors.children )
+            {
+                this._addUndoStep( cursor, true );
+                this._uncommentLine( cursor, cursor.line );
+            }
+        }
+
+        this.processLines();
+        this._hideActiveLine();
+    }
+
+    _uncommentLine( cursor, line ) {
+
+        const lang = this.languages[ this.highlight ];
+
+        if( !( lang.singleLineComments ?? true ))
+            return;
+
+        const token = lang.singleLineCommentToken ?? this.defaultSingleLineCommentToken;
+        const string = this.code.lines[ line ];
+
+        if( string.includes( token ) )
+        {
+            this.code.lines[ line ] = string.replace( token + ' ', '' );
+
+            // try deleting token + space, and then if not, delete only the token
+            if( string.length == this.code.lines[ line ].length )
+                this.code.lines[ line ] = string.replace( token, '' );
+
+            this.cursorToString( cursor, 'X'.repeat( Math.abs( string.length - this.code.lines[ line ].length ) ), true );
+        }
+    }
+
     action( key, deleteSelection, fn ) {
 
         this.actions[ key ] = {
@@ -2379,6 +2563,7 @@ class CodeEditor {
     processLines( mode ) {
         
         var code_html = "";
+        this._blockCommentCache.length = 0;
         
         // Reset all lines content
         this.code.innerHTML = "";
@@ -2413,8 +2598,7 @@ class CodeEditor {
         this.code.style.top = ( this.visibleLinesViewport.x * this.lineHeight ) + "px";
 
         // Update selections
-        if( this.selection )
-            this.processSelection( null, true );
+        this.updateSelections( null, true );
 
         this._clearTmpVariables();
         this._setActiveLine();
@@ -2423,6 +2607,13 @@ class CodeEditor {
 
     processLine( linenum, force ) {
 
+        // Check if we are in block comment sections..
+        if( !force && this._inBlockCommentSection( linenum ) )
+        {
+            this.processLines();
+            return;
+        }
+
         const lang = this.languages[ this.highlight ];
         const local_line_num =  this.toLocalLine( linenum );
         const gutter_line = "<span class='line-gutter'>" + (linenum + 1) + "</span>";
@@ -2431,6 +2622,7 @@ class CodeEditor {
             if( !force ) // Single line update
             {
                 this.code.childNodes[ local_line_num ].innerHTML = gutter_line + html;
+                this._setActiveLine( linenum );
                 this._clearTmpVariables();
             }
             else // Update all lines at once
@@ -2457,6 +2649,9 @@ class CodeEditor {
             return UPDATE_LINE( linestring );
         }
 
+        this._currentLineNumber = linenum;
+        this._currentLineString = linestring;
+
         const tokensToEvaluate = this._getTokensFromLine( linestring );
 
         if( !tokensToEvaluate.length )
@@ -2487,7 +2682,7 @@ class CodeEditor {
             {
                 const blockCommentsToken = ( lang.blockCommentsTokens ?? this.defaultBlockCommentTokens )[ 0 ];
                 if( token.substr( 0, blockCommentsToken.length ) == blockCommentsToken )
-                    this._buildingBlockComment = true;
+                    this._buildingBlockComment = linenum;
             }
 
             line_inner_html += this._evaluateToken( {
@@ -2525,19 +2720,12 @@ class CodeEditor {
                 var matches = (linestring.substring( 0, idx ).match( re ) || []);
                 return (matches.length % 2) !== 0; 
             } );
-            err |= stringKeys.some( function(v) { 
-                var re = new RegExp( v, "g" ); 
-                var matches = (linestring.substring( idx ).match( re ) || []);
-                return (matches.length % 2) !== 0; 
-            } );
             return err ? undefined : idx;
         }
     }
 
     _getTokensFromLine( linestring, skipNonWords ) {
 
-        this._currentLineString = linestring;
-
         // Check if line comment
         const ogLine = linestring;
         const hasCommentIdx = this._lineHasComment( linestring );
@@ -2594,12 +2782,12 @@ class CodeEditor {
 
         if( this.highlight == 'C++' || this.highlight == 'CSS' )
         {
-            var idx = tokens.slice( offset ).findIndex( ( value, index ) => this.isNumber( value ) );
+            var idx = tokens.slice( offset ).findIndex( ( value, index ) => this._isNumber( value ) );
             if( idx > -1 )
             {
                 idx += offset; // Add offset to compute within the whole array of tokens
                 let data = tokens[ idx ] + tokens[ ++idx ];
-                while( this.isNumber( data ) )
+                while( this._isNumber( data ) )
                 {
                     tokens[ idx - 1 ] += tokens[ idx ];
                     tokens.splice( idx, 1 );
@@ -2647,7 +2835,7 @@ class CodeEditor {
         // Manage strings
         this._stringEnded = false;
 
-        if( usePreviousTokenToCheckString || ( !this._buildingBlockComment && ( lang.tags ?? false ? ( this._enclosedByTokens( token, tokenIndex, '<', '>' ) ) : true ) ) )
+        if( usePreviousTokenToCheckString || ( this._buildingBlockComment === undefined && ( lang.tags ?? false ? ( this._enclosedByTokens( token, tokenIndex, '<', '>' ) ) : true ) ) )
         {
             const checkIfStringEnded = t => {
                 const idx = Object.values( customStringKeys ).indexOf( t );
@@ -2696,22 +2884,22 @@ class CodeEditor {
             else if( this._buildingString != undefined )
                 discardToken = this._appendStringToken( token );
             
-            else if( this._mustHightlightWord( token, this.keywords ) && ( lang.tags ?? false ? ( this._enclosedByTokens( token, tokenIndex, '<', '>' ) ) : true ) )
+            else if( this._mustHightlightWord( token, CodeEditor.keywords ) && ( lang.tags ?? false ? ( this._enclosedByTokens( token, tokenIndex, '<', '>' ) ) : true ) )
                 token_classname = "cm-kwd";
 
-            else if( this._mustHightlightWord( token, this.builtin ) && ( lang.tags ?? false ? ( this._enclosedByTokens( token, tokenIndex, '<', '>' ) ) : true ) )
+            else if( this._mustHightlightWord( token, CodeEditor.builtin ) && ( lang.tags ?? false ? ( this._enclosedByTokens( token, tokenIndex, '<', '>' ) ) : true ) )
                 token_classname = "cm-bln";
 
-            else if( this._mustHightlightWord( token, this.statementsAndDeclarations ) )
+            else if( this._mustHightlightWord( token, CodeEditor.statementsAndDeclarations ) )
                 token_classname = "cm-std";
 
-            else if( this._mustHightlightWord( token, this.symbols ) )
+            else if( this._mustHightlightWord( token, CodeEditor.symbols ) )
                 token_classname = "cm-sym";
 
             else if( token.substr( 0, singleLineCommentToken.length ) == singleLineCommentToken )
                 token_classname = "cm-com";
 
-            else if( this.isNumber( token ) || this.isNumber( token.replace(/[px]|[em]|%/g,'') ) )
+            else if( this._isNumber( token ) || this._isNumber( token.replace(/[px]|[em]|%/g,'') ) )
                 token_classname = "cm-dec";
 
             else if( this._isCSSClass( token, prev, next ) )
@@ -2723,7 +2911,7 @@ class CodeEditor {
             else if ( highlight == 'batch' && ( token == '@' || prev == ':' || prev == '@' ) )
                 token_classname = "cm-kwd";
 
-            else if ( highlight == 'cpp' && token.includes( '#' ) ) // C++ preprocessor
+            else if ( [ 'cpp', 'wgsl', 'glsl' ].indexOf( highlight ) > -1 && token.includes( '#' ) ) // C++ preprocessor
                 token_classname = "cm-ppc";
 
             else if ( highlight == 'cpp' && prev == '<' && (next == '>' || next == '*') ) // Defining template type in C++
@@ -2748,9 +2936,10 @@ class CodeEditor {
                 token_classname = "cm-mtd";
 
 
-            if( usesBlockComments && this._buildingBlockComment 
+            if( usesBlockComments && this._buildingBlockComment != undefined 
                 && token.substr( 0, blockCommentsTokens[ 1 ].length ) == blockCommentsTokens[ 1 ] )
             {
+                this._blockCommentCache.push( new LX.vec2( this._buildingBlockComment, this._currentLineNumber ) );
                 delete this._buildingBlockComment;
             }
 
@@ -2799,16 +2988,27 @@ class CodeEditor {
     _enclosedByTokens( token, tokenIndex, tagStart, tagEnd ) {
 
         const tokenStartIndex = this._currentTokenPositions[ tokenIndex ];
-        const tagStartIndex = indexOfFrom(this._currentLineString, tagStart, tokenStartIndex, true );
+        const tagStartIndex = indexOfFrom( this._currentLineString, tagStart, tokenStartIndex, true );
         if( tagStartIndex < 0 ) // Not found..
             return;
-        const tagEndIndex = indexOfFrom(this._currentLineString, tagEnd, tokenStartIndex );
+        const tagEndIndex = indexOfFrom( this._currentLineString, tagEnd, tokenStartIndex );
         if( tagEndIndex < 0 ) // Not found..
             return;
 
         return ( tagStartIndex < tokenStartIndex ) && ( tagEndIndex >= ( tokenStartIndex + token.length ) );
     }
 
+    _inBlockCommentSection( line ) {
+
+        for( var section of this._blockCommentCache )
+        {
+            if( line >= section.x && line <= section.y )
+                return true;
+        }
+
+        return false;
+    }
+
     _isCSSClass( token, prev, next ) {
 
         if( this.highlight != 'CSS' )
@@ -2819,20 +3019,26 @@ class CodeEditor {
                 || ( token[ 0 ] == '#' && prev != ':' ) );
     }
 
-    isNumber( token ) {
+    _isNumber( token ) {
 
         if(this.highlight == 'C++')
         {
             if( token.lastChar == 'f' )
-                return this.isNumber( token.substring(0, token.length - 1) )
+                return this._isNumber( token.substring(0, token.length - 1) )
             else if( token.lastChar == 'u' )
-                return !(token.includes('.')) && this.isNumber( token.substring(0, token.length - 1) );
+                return !(token.includes('.')) && this._isNumber( token.substring(0, token.length - 1) );
+        }
+
+        else if(this.highlight == 'WGSL')
+        {
+            if( token.lastChar == 'u' )
+                return !(token.includes('.')) && this._isNumber( token.substring(0, token.length - 1) );
         }
 
         else if(this.highlight == 'CSS')
         {
             if( token.lastChar == '%' )
-                return this.isNumber( token.substring(0, token.length - 1) )
+                return this._isNumber( token.substring(0, token.length - 1) )
         }
         
         return token.length && token != ' ' && !Number.isNaN(+token);
@@ -2841,7 +3047,7 @@ class CodeEditor {
     _isType( token, prev, next ) {
         
         // Common case
-        if( this._mustHightlightWord( token, this.types ) )
+        if( this._mustHightlightWord( token, CodeEditor.types ) )
             return true;
 
         if( this.highlight == 'JavaScript' )
@@ -2854,30 +3060,31 @@ class CodeEditor {
         }
         else if ( this.highlight == 'WGSL' )
         {
-            const is_kwd = !this._mustHightlightWord( token, this.keywords );
-            return (prev == 'struct' && next == '{') || 
-            ( is_kwd && 
+            const not_kwd = !this._mustHightlightWord( token, CodeEditor.keywords );
+            return  (prev == 'struct' && next == '{') || 
+                    (not_kwd && prev == ':' && next == ';') || 
+            ( not_kwd && 
                 ( prev == ':' && next == ')' || prev == ':' && next == ',' || prev == '>' && next == '{' 
-                    || prev == '<' && next == ',' || prev == '<' && next == '>' || prev == '>' && !next ));
+                    || prev == '<' && next == ',' || prev == '<' && next == '>' || prev == '>' && token != ';' && !next ));
         }
     }
 
     _encloseSelectedWordWithKey( key, lidx, cursor ) {
 
-        if( !this.selection || (this.selection.fromY != this.selection.toY) )
+        if( !cursor.selection || (cursor.selection.fromY != cursor.selection.toY) )
         return false;
         
-        this.selection.invertIfNecessary();
+        cursor.selection.invertIfNecessary();
 
         // Insert first..
         this.code.lines[ lidx ] = [
-            this.code.lines[ lidx ].slice(0, this.selection.fromX), 
+            this.code.lines[ lidx ].slice(0, cursor.selection.fromX), 
             key, 
-            this.code.lines[ lidx ].slice(this.selection.fromX)
+            this.code.lines[ lidx ].slice(cursor.selection.fromX)
         ].join('');
 
         // Go to the end of the word
-        this.cursorToPosition(cursor, this.selection.toX + 1);
+        this.cursorToPosition(cursor, cursor.selection.toX + 1);
 
         // Change next key?
         switch(key)
@@ -2898,10 +3105,10 @@ class CodeEditor {
 
         // Recompute and reposition current selection
         
-        this.selection.fromX++; 
-        this.selection.toX++;
+        cursor.selection.fromX++; 
+        cursor.selection.toX++;
 
-        this.processSelection();
+        this._processSelection( cursor );
         this.processLine( lidx );
 
         // Stop propagation
@@ -2949,14 +3156,16 @@ class CodeEditor {
 
     startSelection( cursor ) {
 
-        // Clear other selections...
-        this.selections.innerHTML = "";
-
         // Show elements
-        this.selections.classList.add( 'show' );
+        let selectionContainer = document.createElement( 'div' );
+        selectionContainer.className = 'selections';
+        selectionContainer.classList.add( 'show' );
+
+        this.codeSizer.insertChildAtIndex( selectionContainer, 2 );
+        this.selections[ cursor.name ] = selectionContainer;
 
         // Create new selection instance
-        this.selection = new CodeSelection( this, cursor.position, cursor.line );
+        cursor.selection = new CodeSelection( this, cursor );
     }
 
     deleteSelection( cursor ) {
@@ -2966,37 +3175,51 @@ class CodeEditor {
             return;
 
         // Some selections don't depend on mouse up..
-        if( this.selection ) this.selection.invertIfNecessary();
+        if( cursor.selection ) cursor.selection.invertIfNecessary();
 
         const separator = "_NEWLINE_";
         let code = this.code.lines.join( separator );
 
         // Get linear start index
         let index = 0;
-        for( let i = 0; i <= this.selection.fromY; i++ )
-            index += (i == this.selection.fromY ? this.selection.fromX : this.code.lines[ i ].length);
+        for( let i = 0; i <= cursor.selection.fromY; i++ )
+            index += (i == cursor.selection.fromY ? cursor.selection.fromX : this.code.lines[ i ].length);
 
-        index += this.selection.fromY * separator.length; 
+        index += cursor.selection.fromY * separator.length; 
 
-        const num_chars = this.selection.chars + (this.selection.toY - this.selection.fromY) * separator.length;
+        const num_chars = cursor.selection.chars + (cursor.selection.toY - cursor.selection.fromY) * separator.length;
         const pre = code.slice( 0, index );
         const post = code.slice( index + num_chars );
 
         this.code.lines = ( pre + post ).split( separator );
         
-        this.cursorToLine( cursor, this.selection.fromY, true );
-        this.cursorToPosition( cursor, this.selection.fromX );
-        this.endSelection();
+        this.cursorToLine( cursor, cursor.selection.fromY, true );
+        this.cursorToPosition( cursor, cursor.selection.fromX );
+        this.endSelection( cursor );
         this.processLines();
     }
 
-    endSelection() {
+    endSelection( cursor ) {
 
-        this.selections.classList.remove( 'show' );
-        this.selections.innerHTML = "";
-        delete this.selection;
         delete this._tripleClickSelection;
         delete this._lastSelectionKeyDir;
+        delete this._currentOcurrences;
+
+        if( cursor )
+        {
+            deleteElement( this.selections[ cursor.name ] );
+            delete this.selections[ cursor.name ];
+            delete cursor.selection;
+        }
+        else
+        {
+            for( let cursor of this.cursors.children )
+            {
+                deleteElement( this.selections[ cursor.name ] );
+                delete this.selections[ cursor.name ];
+                delete cursor.selection;
+            }
+        }
     }
 
     selectAll() {
@@ -3010,13 +3233,13 @@ class CodeEditor {
         this.startSelection( cursor );
 
         const nlines = this.code.lines.length - 1;
-        this.selection.toX = this.code.lines[ nlines ].length;
-        this.selection.toY = nlines;
+        cursor.selection.toX = this.code.lines[ nlines ].length;
+        cursor.selection.toY = nlines;
 
-        this.cursorToPosition( cursor, this.selection.toX );
-        this.cursorToLine( cursor, this.selection.toY );
+        this.cursorToPosition( cursor, cursor.selection.toX );
+        this.cursorToLine( cursor, cursor.selection.toY );
 
-        this.processSelection( null, true );
+        this._processSelection( cursor, null, true );
 
         this.hideAutoCompleteBox();
     }
@@ -3122,6 +3345,8 @@ class CodeEditor {
 
         state.position = cursor.position;
         state.line = cursor.line;
+        state.selection = cursor.selection ? cursor.selection.save() : undefined;
+
         return state;
     }
 
@@ -3154,7 +3379,7 @@ class CodeEditor {
         const cursorsInLine = Array.from( this.cursors.children ).filter( v => v.line == line );
 
         while( cursorsInLine.length > 1 )
-            cursorsInLine.pop().remove();
+            this.removeCursor( cursorsInLine.pop() );
     }
 
     restoreCursor( cursor, state ) {
@@ -3166,6 +3391,22 @@ class CodeEditor {
         cursor.style.left = "calc(" + cursor._left + "px + " + this.xPadding + ")";
         cursor._top = cursor.line * this.lineHeight;
         cursor.style.top = "calc(" + cursor._top + "px)";
+
+        if( state.selection )
+        {
+            this.startSelection( cursor );
+
+            cursor.selection.load( state.selection );
+
+            this._processSelection( cursor, null, true );
+        }
+    }
+
+    removeCursor( cursor ) {
+
+        deleteElement( this.selections[ cursor.name ] );
+        delete this.selections[ cursor.name ];
+        deleteElement( cursor );
     }
 
     resetCursorPos( flag, cursor ) {
@@ -3486,11 +3727,11 @@ class CodeEditor {
 
         // Add language special keys...
         suggestions = suggestions.concat(   
-            Object.keys( this.builtin[ this.highlight ] ?? {} ),
-            Object.keys( this.keywords[ this.highlight ] ?? {} ),
-            Object.keys( this.statementsAndDeclarations[ this.highlight ] ?? {} ),
-            Object.keys( this.types[ this.highlight ] ?? {} ),
-            Object.keys( this.utils[ this.highlight ] ?? {} )
+            Object.keys( CodeEditor.builtin[ this.highlight ] ?? {} ),
+            Object.keys( CodeEditor.keywords[ this.highlight ] ?? {} ),
+            Object.keys( CodeEditor.statementsAndDeclarations[ this.highlight ] ?? {} ),
+            Object.keys( CodeEditor.types[ this.highlight ] ?? {} ),
+            Object.keys( CodeEditor.utils[ this.highlight ] ?? {} )
         );
 
         // Add words in current tab plus remove current word
@@ -3512,9 +3753,9 @@ class CodeEditor {
 
             var icon = document.createElement( 'a' );
             
-            if( this._mustHightlightWord( s, this.utils ) )
+            if( this._mustHightlightWord( s, CodeEditor.utils ) )
                 icon.className = "fa fa-cube";
-            else if( this._mustHightlightWord( s, this.types ) )
+            else if( this._mustHightlightWord( s, CodeEditor.types ) )
                 icon.className = "fa fa-code";
             else
                 icon.className = "fa fa-font";
@@ -3630,6 +3871,8 @@ class CodeEditor {
 
     showSearchBox( clear ) {
         
+        this.hideSearchLineBox();
+
         this.searchbox.classList.add( 'opened' );
         this.searchboxActive = true;
 
@@ -3639,12 +3882,26 @@ class CodeEditor {
         {
             input.value = "";
         }
+        else
+        {
+            const cursor = this._getCurrentCursor();
+
+            if( cursor.selection )
+            {
+                input.value = cursor.selection.getText() ?? input.value;
+            }
+        }
+
+        input.selectionStart = 0;
+        input.selectionEnd = input.value.length;
 
         input.focus();
     }
 
     hideSearchBox() {
 
+        const active = this.searchboxActive;
+
         if( this.searchboxActive )
         {
             this.searchbox.classList.remove( 'opened' );
@@ -3653,31 +3910,49 @@ class CodeEditor {
 
         else if( this._lastResult )
         {
-            this._lastResult.dom.remove();
+            deleteElement( this._lastResult.dom );
             delete this._lastResult;
         }
+
+        this.searchResultSelections.classList.remove( 'show' );
+
+        return active != this.searchboxActive;
     }
 
-    search( text, reverse ) {
+    search( text, reverse, callback, skipAlert ) {
 
         text = text ?? this._lastTextFound;
 
         if( !text )
             return;
 
-        let cursorData = new LX.vec2( this.position, this.line );
+        let cursor = this._getCurrentCursor();
+        let cursorData = new LX.vec2( cursor.position, cursor.line );
         let line = null;
         let char = -1;
 
         if( this._lastResult )
         {
-            this._lastResult.dom.remove();
+            deleteElement( this._lastResult.dom );
             cursorData = this._lastResult.pos;
             delete this._lastResult;
         }
 
         const getIndex = l => {
-            return this.code.lines[ l ].substr( l == cursorData.y ? cursorData.x : 0 ).indexOf( text );
+            
+            var string = this.code.lines[ l ];
+
+            if( reverse )
+            {
+                string = string.substr( 0, l == cursorData.y ? cursorData.x : string.length );
+                var reversed = strReverse( string );
+                var reversedIdx = reversed.indexOf( strReverse( text ) );
+                return reversedIdx == -1 ? -1 : string.length - reversedIdx - text.length;
+            }
+            else
+            {
+                return string.substr( l == cursorData.y ? cursorData.x : 0 ).indexOf( text );
+            }
         };
 
         if( reverse )
@@ -3707,7 +3982,15 @@ class CodeEditor {
 
         if( line == null)
         {
-            alert("No results!")
+            if( !skipAlert )
+                alert( "No results!" );
+
+            const lastLine = this.code.lines.length - 1;
+
+            this._lastResult = {
+                'dom': this.searchResultSelections.lastChild,
+                'pos': reverse ? new LX.vec2( this.code.lines[ lastLine ].length, lastLine ) : new LX.vec2( 0, 0 )
+            };
             return;
         }
         
@@ -3717,32 +4000,44 @@ class CodeEditor {
             have to add the length of the substring (0, first_ocurrence)
         */
 
-        char += ( line == cursorData.y ? cursorData.x : 0 );
+
+        if( !reverse )
+            char += ( line == cursorData.y ? cursorData.x : 0 );
+
 
         // Text found..
 
         this._lastTextFound = text;
 
         this.codeScroller.scrollTo( 
-            Math.max( char * this.charWidth - this.codeScroller.clientWidth ), 
-            Math.max( line - 10 ) * this.lineHeight 
+            Math.max( char * this.charWidth - this.codeScroller.clientWidth, 0 ), 
+            Math.max( line - 10, 0 ) * this.lineHeight 
         );
 
-        // Show elements
-        this.selections.classList.add( 'show' );
+        if( callback )
+        {
+            callback( char, line );
+        }
+        else
+        {
+            // Show elements
+            this.searchResultSelections.classList.add( 'show' );
+
+            // Create new selection instance
+            cursor.selection = new CodeSelection( this, cursor, "lexcodesearchresult" );
+            cursor.selection.selectInline( cursor, char, line, this.measureString( text ), true );
+        }
 
-        // Create new selection instance
-        this.selection = new CodeSelection( this, 0, 0, "lexcodesearchresult" );
-        this.selection.selectInline( char, line, this.measureString( text ) );
         this._lastResult = {
-            'dom': this.selections.lastChild,
-            'pos': new LX.vec2( char + text.length, line )
+            'dom': this.searchResultSelections.lastChild,
+            'pos': new LX.vec2( char + text.length * ( reverse ? -1 : 1 ) , line )
         };
-
     }
 
     showSearchLineBox() {
         
+        this.hideSearchBox();
+
         this.searchlinebox.classList.add( 'opened' );
         this.searchlineboxActive = true;
 
@@ -3762,7 +4057,7 @@ class CodeEditor {
 
     goToLine( line ) {
 
-        if( !this.isNumber( line ) )
+        if( !this._isNumber( line ) )
             return;
 
         this.codeScroller.scrollTo( 0, Math.max( line - 15 ) * this.lineHeight );
@@ -3772,6 +4067,40 @@ class CodeEditor {
         this.cursorToLine( cursor, line - 1, true );
     }
 
+    selectNextOcurrence( cursor ) {
+
+        if( !cursor.selection )
+            return;
+
+        const text = cursor.selection.getText();
+        if( !text )
+            return;
+
+        if( !this._currentOcurrences )
+        {
+            const currentKey = [ cursor.position - text.length, cursor.line ].join( '_' );
+            this._currentOcurrences = { };
+            this._currentOcurrences[ currentKey ] = true;
+        }
+
+        this.search( text, false, (col, ln) => {
+
+            const key = [ col, ln ].join( '_' );
+
+            if( this._currentOcurrences[ key ] ) {
+                return;
+            }
+
+            var newCursor = this._addCursor( ln, col, true );
+            this.startSelection( newCursor );
+            newCursor.selection.selectInline( newCursor, col, ln, this.measureString( text ) );
+            this.cursorToString( newCursor, text );
+
+            this._currentOcurrences[ key ] = true;
+
+        }, true );
+    }
+
     _updateDataInfoPanel( signal, value ) {
 
         if( !this.skipCodeInfo )
@@ -3809,6 +4138,11 @@ class CodeEditor {
         }
     }
 
+    _hideActiveLine() {
+
+        this.code.querySelectorAll( '.active-line' ).forEach( e => e.classList.remove( 'active-line' ) );
+    }
+
     _increaseFontSize() {
 
         // Change font size
@@ -3864,13 +4198,96 @@ class CodeEditor {
     _clearTmpVariables() {
 
         delete this._currentLineString;
+        delete this._currentLineNumber;
         delete this._buildingString; 
         delete this._pendingString;
         delete this._buildingBlockComment;
         delete this._markdownHeader;
+        delete this._lastResult;
     }
 }
 
+CodeEditor.keywords = {
+
+    'JavaScript': ['var', 'let', 'const', 'this', 'in', 'of', 'true', 'false', 'new', 'function', 'NaN', 'static', 'class', 'constructor', 'null', 'typeof', 'debugger', 'abstract',
+                  'arguments', 'extends', 'instanceof'],
+    'C++': ['int', 'float', 'double', 'bool', 'char', 'wchar_t', 'const', 'static_cast', 'dynamic_cast', 'new', 'delete', 'void', 'true', 'false', 'auto', 'struct', 'typedef', 'nullptr', 
+            'NULL', 'unsigned', 'namespace'],
+    'JSON': ['true', 'false'],
+    'GLSL': ['true', 'false', 'function', 'int', 'float', 'vec2', 'vec3', 'vec4', 'mat2x2', 'mat3x3', 'mat4x4', 'struct'],
+    'CSS': ['body', 'html', 'canvas', 'div', 'input', 'span', '.'],
+    'WGSL': ['var', 'let', 'true', 'false', 'fn', 'bool', 'u32', 'i32', 'f16', 'f32', 'vec2f', 'vec3f', 'vec4f', 'mat2x2f', 'mat3x3f', 'mat4x4f', 'array', 'atomic', 'struct',
+            'sampler', 'sampler_comparison', 'texture_depth_2d', 'texture_depth_2d_array', 'texture_depth_cube', 'texture_depth_cube_array', 'texture_depth_multisampled_2d',
+            'texture_external', 'texture_1d', 'texture_2d', 'texture_2d_array', 'texture_3d', 'texture_cube', 'texture_cube_array', 'texture_storage_1d', 'texture_storage_2d',
+            'texture_storage_2d_array', 'texture_storage_3d', 'vec2u', 'vec3u', 'vec4u'],
+    'Rust': ['as', 'const', 'crate', 'enum', 'extern', 'false', 'fn', 'impl', 'in', 'let', 'mod', 'move', 'mut', 'pub', 'ref', 'self', 'Self', 'static', 'struct', 'super', 'trait', 'true', 
+             'type', 'unsafe', 'use', 'where', 'abstract', 'become', 'box', 'final', 'macro', 'override', 'priv', 'typeof', 'unsized', 'virtual'],
+    'Python': ['False', 'def', 'None', 'True', 'in', 'is', 'and', 'lambda', 'nonlocal', 'not', 'or'],
+    'Batch': ['set', 'SET', 'echo', 'ECHO', 'off', 'OFF', 'del', 'DEL', 'defined', 'DEFINED', 'setlocal', 'SETLOCAL', 'enabledelayedexpansion', 'ENABLEDELAYEDEXPANSION', 'driverquery', 
+              'DRIVERQUERY', 'print', 'PRINT'],
+    'HTML': ['html', 'meta', 'title', 'link', 'script', 'body', 'DOCTYPE', 'head', 'br', 'i', 'a', 'li', 'img', 'tr', 'td', 'h1', 'h2', 'h3', 'h4', 'h5'],
+    'Markdown': ['br', 'i', 'a', 'li', 'img', 'table', 'title', 'tr', 'td', 'h1', 'h2', 'h3', 'h4', 'h5'],
+};
+
+CodeEditor.utils = { // These ones don't have hightlight, used as suggestions to autocomplete only...
+
+    'JavaScript': ['querySelector', 'body', 'addEventListener', 'removeEventListener', 'remove', 'sort', 'keys', 'filter', 'isNaN', 'parseFloat', 'parseInt', 'EPSILON', 'isFinite',
+                  'bind', 'prototype', 'length', 'assign', 'entries', 'values', 'concat', 'substring', 'substr', 'splice', 'slice', 'buffer', 'appendChild', 'createElement', 'prompt',
+                  'alert'],
+    'WGSL': ['textureSample'],
+    'Python': ['abs', 'all', 'any', 'ascii', 'bin', 'bool', 'bytearray', 'bytes', 'callable', 'chr', 'classmethod', 'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 
+              'enumerate', 'eval', 'exec', 'filter', 'float', 'format', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help', 'hex', 'id', 'input', 'int', 'isinstance',
+              'issubclass', 'iter', 'len', 'list', 'locals', 'map', 'max', 'memoryview', 'min', 'next', 'object', 'oct', 'open', 'ord', 'pow', 'print', 'property', 'range', 'repr', 
+              'reversed', 'round', 'set', 'setattr', 'slice', 'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'vars', 'zip']
+};
+
+CodeEditor.types = {
+
+    'JavaScript': ['Object', 'String', 'Function', 'Boolean', 'Symbol', 'Error', 'Number', 'TextEncoder', 'TextDecoder'],
+    'Rust': ['u128'],
+    'Python': ['int', 'type', 'float', 'map', 'list', 'ArithmeticError', 'AssertionError', 'AttributeError', 'Exception', 'EOFError', 'FloatingPointError', 'GeneratorExit', 
+              'ImportError', 'IndentationError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'LookupError', 'MemoryError', 'NameError', 'NotImplementedError', 'OSError',
+              'OverflowError', 'ReferenceError', 'RuntimeError', 'StopIteration', 'SyntaxError', 'TabError', 'SystemError', 'SystemExit', 'TypeError', 'UnboundLocalError', 
+              'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError', 'UnicodeTranslateError', 'ValueError', 'ZeroDivisionError'],
+    'C++': ['uint8_t', 'uint16_t', 'uint32_t']
+};
+
+CodeEditor.builtin = {
+
+    'JavaScript': ['document', 'console', 'window', 'navigator', 'performance'],
+    'CSS': ['*', '!important'],
+    'C++': ['vector', 'list', 'map'],
+    'HTML': ['type', 'xmlns', 'PUBLIC', 'http-equiv', 'src', 'style', 'lang', 'href', 'rel', 'content', 'xml', 'alt'], // attributes
+    'Markdown': ['type', 'src', 'style', 'lang', 'href', 'rel', 'content', 'valign', 'alt'], // attributes
+};
+
+CodeEditor.statementsAndDeclarations = {
+
+    'JavaScript': ['for', 'if', 'else', 'case', 'switch', 'return', 'while', 'continue', 'break', 'do', 'import', 'from', 'throw', 'async', 'try', 'catch', 'await'],
+    'CSS': ['@', 'import'],
+    'C++': ['std', 'for', 'if', 'else', 'return', 'continue', 'break', 'case', 'switch', 'while', 'using', 'glm', 'spdlog'],
+    'GLSL': ['for', 'if', 'else', 'return', 'continue', 'break'],
+    'WGSL': ['const','for', 'if', 'else', 'return', 'continue', 'break', 'storage', 'read', 'read_write', 'uniform', 'function', 'workgroup'],
+    'Rust': ['break', 'else', 'continue', 'for', 'if', 'loop', 'match', 'return', 'while', 'do', 'yield'],
+    'Python': ['if', 'raise', 'del', 'import', 'return', 'elif', 'try', 'else', 'while', 'as', 'except', 'with', 'assert', 'finally', 'yield', 'break', 'for', 'class', 'continue', 
+              'global', 'pass'],
+    'Batch': ['if', 'IF', 'for', 'FOR', 'in', 'IN', 'do', 'DO', 'call', 'CALL', 'goto', 'GOTO', 'exit', 'EXIT']
+};
+
+CodeEditor.symbols = {
+
+    'JavaScript': ['<', '>', '[', ']', '{', '}', '(', ')', ';', '=', '|', '||', '&', '&&', '?', '??'],
+    'C++': ['<', '>', '[', ']', '{', '}', '(', ')', ';', '=', '|', '||', '&', '&&', '?', '::', '*', '-', '+'],
+    'JSON': ['[', ']', '{', '}', '(', ')'],
+    'GLSL': ['[', ']', '{', '}', '(', ')'],
+    'WGSL': ['[', ']', '{', '}', '(', ')', '->'],
+    'CSS': ['{', '}', '(', ')', '*'],
+    'Rust': ['<', '>', '[', ']', '(', ')', '='],
+    'Python': ['<', '>', '[', ']', '(', ')', '='],
+    'Batch': ['[', ']', '(', ')', '%'],
+    'HTML': ['<', '>', '/']
+};
+
 LX.CodeEditor = CodeEditor;
 
 export { CodeEditor };