Update codeit.js

Author: KostaMalsev

lib/codeit.js

@@ -733,97 +733,92 @@ class CodeitElement extends HTMLElement {
     function handleSelfClosingCharacters(event) {
 
       const cursor = cd.dropper.cursor();
-      const inStringOrComment = (cursor.in('string') || cursor.in('comment'));
+      //const inStringOrComment = (cursor.in('string') || cursor.in('comment'));
 
-      // if cursor is not in string or comment
-      if (!inStringOrComment) {
+      // join brackets and quotation marks
+      // to get chars to autocomplete
+      const open = cd.options.openBrackets.join('') + cd.options.quot.join('');
+      const close = cd.options.closeBrackets.join('') + cd.options.quot.join('');
 
-        // join brackets and quotation marks
-        // to get chars to autocomplete
-        const open = cd.options.openBrackets.join('') + cd.options.quot.join('');
-        const close = cd.options.closeBrackets.join('') + cd.options.quot.join('');
+      // get code before and after cursor
+      const codeAfter = cd.afterCursor();
+      const codeBefore = cd.beforeCursor();
 
-        // get code before and after cursor
-        const codeAfter = cd.afterCursor();
-        const codeBefore = cd.beforeCursor();
+      const charBefore = codeBefore.slice(-1);
+      const charAfter = codeAfter.charAt(0);
 
-        const charBefore = codeBefore.slice(-1);
-        const charAfter = codeAfter.charAt(0);
+      // check if typed an opening or closing char
+      const typedOpeningChar = open.includes(event.key);
+      const typedClosingChar = close.includes(event.key);
 
-        // check if typed an opening or closing char
-        const typedOpeningChar = open.includes(event.key);
-        const typedClosingChar = close.includes(event.key);
+      // closing char is next to cursor if
+      // the chars before and after the cursor are
+      // matching opening and closing chars
+      const closingCharNextToCursor = (charBefore === open[close.indexOf(event.key)]
+                                       && charAfter === event.key);
 
-        // closing char is next to cursor if
-        // the chars before and after the cursor are
-        // matching opening and closing chars
-        const closingCharNextToCursor = (charBefore === open[close.indexOf(event.key)]
-                                         && charAfter === event.key);
+      // if typed opening char
+      if (typedOpeningChar) {
 
-        // if typed opening char
-        if (typedOpeningChar) {
+        // if selection exists
+        if (!cursor.collapsed) {
 
-          // if selection exists
-          if (!cursor.collapsed) {
+          // prevent default behavior
+          event.preventDefault();
 
-            // prevent default behavior
-            event.preventDefault();
+          // get the text to wrap
+          const textToWrap = window.getSelection().toString();
 
-            // get the text to wrap
-            const textToWrap = window.getSelection().toString();
+          // wrap the text with matching opening and closing chars
+          const wrappedText = event.key + textToWrap + close[open.indexOf(event.key)];
 
-            // wrap the text with matching opening and closing chars
-            const wrappedText = event.key + textToWrap + close[open.indexOf(event.key)];
+          // delete current selection
+          cd.deleteCurrentSelection();
 
-            // delete current selection
-            cd.deleteCurrentSelection();
+          // insert wrapped text
+          cd.insert(wrappedText, { moveToEnd: false });
+          
+          // get caret pos in text
+          const pos = cd.getSelection();
+          
+          // restore pos in text
+          cd.setSelection(pos.start, (pos.start + wrappedText.length));
 
-            // insert wrapped text
-            cd.insert(wrappedText, { moveToEnd: false });
+        } else {
+          
+          // get caret pos in text
+          const pos = cd.getSelection();
+
+          // if cursor is on last line
+          if (pos.start === cd.textContent.length) {
 
-            // get caret pos in text
-            const pos = cd.getSelection();
+            // insert newline
+            cd.insert((close[open.indexOf(event.key)] + '\n'), { moveToEnd: false });
 
-            // restore pos in text
-            cd.setSelection(pos.start, (pos.start + wrappedText.length));
-
           } else {
-            
-            // get caret pos in text
-            const pos = cd.getSelection();
-
-            // if cursor is on last line
-            if (pos.start === cd.textContent.length) {
-              
-              // insert newline
-              cd.insert((close[open.indexOf(event.key)] + '\n'), { moveToEnd: false });
-              
-            } else {
-
-              // insert matching closing char
-              cd.insert(close[open.indexOf(event.key)], { moveToEnd: false });
-              
-            }
 
+            // insert matching closing char
+            cd.insert(close[open.indexOf(event.key)], { moveToEnd: false });
+            
           }
 
         }
 
-        // if typed closing char but closing char
-        // is already next to cursor
-        if (typedClosingChar && closingCharNextToCursor) {
+      }
 
-          // prevent default behavior
-          event.preventDefault();
+      // if typed closing char but closing char
+      // is already next to cursor
+      if (typedClosingChar && closingCharNextToCursor) {
 
-          // get caret pos in text
-          const pos = cd.getSelection();
+        // prevent default behavior
+        event.preventDefault();
 
-          // move caret one char right
-          pos.start++;
-          cd.setSelection(pos.start);
+        // get caret pos in text
+        const pos = cd.getSelection();
 
-        }
+        // move caret one char right
+        pos.start++;
+        cd.setSelection(pos.start);
 
       }