Update codeit.js

Author: benhatsor

lib/codeit.js

@@ -1,7 +1,7 @@
 /*
 
    codeit.js
-   v3.1.1
+   v3.1.2
    MIT License
 
    https://codeit.codes
@@ -583,30 +583,46 @@ class CodeitElement extends HTMLElement {
 
         if (event.shiftKey) {
 
-          const before = cd.beforeCursor();
-
-          // get padding of line
-          let [padding, start] = getPadding(before);
+          // delete a tab from selection
 
           // get caret pos in text
-          let pos = cd.getSelection();
-
-          if (padding.length > 0) {
-
-            const tabLength = cd.options.tab.length;
+          const pos = cd.getSelection();
 
-            // remove full length tab
+          let startPos = Math.min(pos.start, pos.end);
+          let endPos = Math.max(pos.start, pos.end);
+          
+          // get text before cursor
+          
+          cd.setSelection(endPos);
+          
+          const before = cd.beforeCursor();
 
-            cd.setSelection(start + tabLength);
+          // get padding of line
+          let [linePadding, lineStartPos] = getPadding(before);
+          
+          // if line has tabs
+          if (linePadding.length > 0) {
 
-            for (let i = 0; i < tabLength; i++) cd.deleteCurrentSelection();
+            // delete a tab
+            
+            const tabLength = cd.options.tab.length;
 
-            pos.start -= tabLength;
-            pos.end -= tabLength;
+            cd.setSelection(lineStartPos, lineStartPos + tabLength);
 
+            cd.deleteCurrentSelection();
+            
             // restore pos in text
-            cd.setSelection(pos.start, pos.end);
+            cd.setSelection(lineStartPos + linePadding.length - tabLength, endPos - tabLength);
 
+            const selectedTab = window.getSelection().toString().startsWith(cd.options.tab);
+            
+            if (selectedTab) {
+              
+              // restore pos in text
+              cd.setSelection(lineStartPos + linePadding.length, endPos - tabLength);
+              
+            }
+            
           }
 
         } else {
@@ -621,29 +637,38 @@ class CodeitElement extends HTMLElement {
 
             if (selContents.includes('\n')) {
 
-              // tab lines in selection
+              // add tabs to selection string
               selContents = cd.options.tab + selContents.split('\n').join('\n' + cd.options.tab);
 
-              // insert tabbed selection
+              // delete selection
               cd.deleteCurrentSelection();
-              cd.insert(selContents);
+              
+              // insert tabbed selection
+              cd.insert(selContents, { moveToEnd: false });
+              
+              // get caret pos in text
+              const pos = cd.getSelection();
+              
+              // restore pos in text
+              cd.setSelection(pos.start, (pos.start + selContents.length));
 
             } else {
 
               // tab selection
-              const sel = cd.getSelection();
 
-              cd.setSelection(Math.min(sel.start, sel.end));
+              // get caret pos in text
+              const pos = cd.getSelection();
 
-              // insert tab at start of selection
-              cd.insert(cd.options.tab);
+              const start = Math.min(pos.start, pos.end);
+              const end = Math.max(pos.start, pos.end);
 
-              // reselect text
+              cd.setSelection(start);
 
-              sel.start += cd.options.tab.length;
-              sel.end += cd.options.tab.length;
+              // insert tab at start of selection
+              cd.insert(cd.options.tab, { moveToEnd: false });
 
-              cd.setSelection(sel.start, sel.end);
+              // restore pos in text
+              cd.setSelection(start, end + cd.options.tab.length);
 
             }