Autosize editor after indent/newlinemh/fix-editor-newlines

2 files changed, 13 insertions, 1 deletions

diff --git a/app/assets/javascripts/gl_form.js b/app/assets/javascripts/gl_form.js
index b98fe9f6ce2..eafc9c12c51 100644
--- a/app/assets/javascripts/gl_form.js
+++ b/app/assets/javascripts/gl_form.js
@@ -165,8 +165,17 @@ export default class GLForm {
       this.indentHelper.newline();
     } else if (keystroke(event, keys.BACKSPACE_KEY_CODE)) {
       // ==== Auto-delete indents at the beginning of the line ====
+      // Event should not be prevented when not backspacing an indent - this is left to the browser
       this.indentHelper.backspace(event);
     }
+
+    if (event.defaultPrevented) {
+      // Allow the backing vue app to pick up on the changes
+      this.textarea.trigger('input');
+      this.textarea.trigger('change');
+
+      autosize.update(this.textarea[0]);
+    }
   }
 
   handleKeyShortcuts(event) {
diff --git a/app/assets/javascripts/helpers/indent_helper.js b/app/assets/javascripts/helpers/indent_helper.js
index a8815fac04e..d1cfefa4728 100644
--- a/app/assets/javascripts/helpers/indent_helper.js
+++ b/app/assets/javascripts/helpers/indent_helper.js
@@ -20,7 +20,10 @@ export default class IndentHelper {
   }
 
   getSelection() {
-    return { start: this.element.selectionStart, end: this.element.selectionEnd };
+    return {
+      start: Math.max(0, Math.min(this.element.selectionStart, this.element.value.length)),
+      end: Math.max(0, Math.min(this.element.selectionEnd, this.element.value.length)),
+    };
   }
 
   isRangeSelection() {