package 07.12.22

ajaxorg · Dec 7, 2022 · 44279f4 · 44279f4
1 parent fdab4a6
commit 44279f4
Show file tree

Hide file tree

Showing 172 changed files with 7,534 additions and 1,105 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.13.2](https://github.com/ajaxorg/ace/compare/v1.13.1...v1.13.2) (2022-12-07)
+
+
+### Bug Fixes
+
+* Add missing options to `EditorOptions` ([#5003](https://github.com/ajaxorg/ace/issues/5003)) ([451b63f](https://github.com/ajaxorg/ace/commit/451b63f2243762d6de2fc5b9ee8c580c348b933c))
+* Better ES6 support for JavaScript Mode ([6fb39e3](https://github.com/ajaxorg/ace/commit/6fb39e38c79dd966233e48ed06be800c59c4c101))
+* Fix vim keybindings scroll to the selected line ([#4980](https://github.com/ajaxorg/ace/issues/4980)) ([8562f94](https://github.com/ajaxorg/ace/commit/8562f9493e0ebef865064992f0526fdc6df8535a))
+* show 2 context characters of a line when moving to it ([#4998](https://github.com/ajaxorg/ace/issues/4998)) ([743190e](https://github.com/ajaxorg/ace/commit/743190ea71841c0186b2f513b3d1e1a9e30d3de3))
+
 ### [1.13.1](https://github.com/ajaxorg/ace/compare/v1.13.0...v1.13.1) (2022-11-16)
 
 

diff --git a/ace.d.ts b/ace.d.ts
@@ -218,6 +218,9 @@ export namespace Ace {
     behavioursEnabled: boolean;
     wrapBehavioursEnabled: boolean;
     enableAutoIndent: boolean;
+    enableBasicAutocompletion: boolean | Completer[],
+    enableLiveAutocompletion: boolean | Completer[],
+    enableSnippets: boolean,
     autoScrollEditorIntoView: boolean;
     keyboardHandler: string | null;
     placeholder: string;
@@ -936,4 +939,4 @@ export const Range: {
   new(startRow: number, startColumn: number, endRow: number, endColumn: number): Ace.Range;
   fromPoints(start: Ace.Point, end: Ace.Point): Ace.Range;
   comparePoints(p1: Ace.Point, p2: Ace.Point): number;
-};
+};
diff --git a/kitchen-sink.html b/kitchen-sink.html
@@ -8,7 +8,7 @@
     <meta name="author" content="Fabian Jakobs">
     <!--
     Ace
-      version 1.13.1
+      version 1.13.2
       commit  
     -->
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "ace-builds",
     "main": "./src-noconflict/ace.js",
     "typings": "ace.d.ts",
-    "version": "1.13.1",
+    "version": "1.13.2",
     "description": "Ace (Ajax.org Cloud9 Editor)",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/src-min-noconflict/ace.js b/src-min-noconflict/ace.js
diff --git a/src-min-noconflict/keybinding-vim.js b/src-min-noconflict/keybinding-vim.js
diff --git a/src-min-noconflict/mode-coldfusion.js b/src-min-noconflict/mode-coldfusion.js
diff --git a/src-min-noconflict/mode-csound_document.js b/src-min-noconflict/mode-csound_document.js
diff --git a/src-min-noconflict/mode-curly.js b/src-min-noconflict/mode-curly.js
diff --git a/src-min-noconflict/mode-django.js b/src-min-noconflict/mode-django.js
diff --git a/src-min-noconflict/mode-ejs.js b/src-min-noconflict/mode-ejs.js
diff --git a/src-min-noconflict/mode-ftl.js b/src-min-noconflict/mode-ftl.js
diff --git a/src-min-noconflict/mode-gobstones.js b/src-min-noconflict/mode-gobstones.js
diff --git a/src-min-noconflict/mode-groovy.js b/src-min-noconflict/mode-groovy.js
diff --git a/src-min-noconflict/mode-haml.js b/src-min-noconflict/mode-haml.js
diff --git a/src-min-noconflict/mode-handlebars.js b/src-min-noconflict/mode-handlebars.js
diff --git a/src-min-noconflict/mode-html.js b/src-min-noconflict/mode-html.js
diff --git a/src-min-noconflict/mode-html_elixir.js b/src-min-noconflict/mode-html_elixir.js
diff --git a/src-min-noconflict/mode-html_ruby.js b/src-min-noconflict/mode-html_ruby.js
diff --git a/src-min-noconflict/mode-jade.js b/src-min-noconflict/mode-jade.js
diff --git a/src-min-noconflict/mode-java.js b/src-min-noconflict/mode-java.js
diff --git a/src-min-noconflict/mode-javascript.js b/src-min-noconflict/mode-javascript.js
diff --git a/src-min-noconflict/mode-jsp.js b/src-min-noconflict/mode-jsp.js
diff --git a/src-min-noconflict/mode-latte.js b/src-min-noconflict/mode-latte.js
diff --git a/src-min-noconflict/mode-liquid.js b/src-min-noconflict/mode-liquid.js
diff --git a/src-min-noconflict/mode-luapage.js b/src-min-noconflict/mode-luapage.js
diff --git a/src-min-noconflict/mode-markdown.js b/src-min-noconflict/mode-markdown.js
diff --git a/src-min-noconflict/mode-mask.js b/src-min-noconflict/mode-mask.js
diff --git a/src-min-noconflict/mode-nunjucks.js b/src-min-noconflict/mode-nunjucks.js
diff --git a/src-min-noconflict/mode-pgsql.js b/src-min-noconflict/mode-pgsql.js
diff --git a/src-min-noconflict/mode-php.js b/src-min-noconflict/mode-php.js
diff --git a/src-min-noconflict/mode-php_laravel_blade.js b/src-min-noconflict/mode-php_laravel_blade.js
diff --git a/src-min-noconflict/mode-razor.js b/src-min-noconflict/mode-razor.js
diff --git a/src-min-noconflict/mode-rhtml.js b/src-min-noconflict/mode-rhtml.js
diff --git a/src-min-noconflict/mode-scala.js b/src-min-noconflict/mode-scala.js
diff --git a/src-min-noconflict/mode-sjs.js b/src-min-noconflict/mode-sjs.js
diff --git a/src-min-noconflict/mode-slim.js b/src-min-noconflict/mode-slim.js
diff --git a/src-min-noconflict/mode-smarty.js b/src-min-noconflict/mode-smarty.js
diff --git a/src-min-noconflict/mode-soy_template.js b/src-min-noconflict/mode-soy_template.js
diff --git a/src-min-noconflict/mode-svg.js b/src-min-noconflict/mode-svg.js
diff --git a/src-min-noconflict/mode-tsx.js b/src-min-noconflict/mode-tsx.js
diff --git a/src-min-noconflict/mode-twig.js b/src-min-noconflict/mode-twig.js
diff --git a/src-min-noconflict/mode-typescript.js b/src-min-noconflict/mode-typescript.js
diff --git a/src-min-noconflict/mode-velocity.js b/src-min-noconflict/mode-velocity.js
diff --git a/src-min-noconflict/mode-visualforce.js b/src-min-noconflict/mode-visualforce.js
diff --git a/src-min-noconflict/mode-wollok.js b/src-min-noconflict/mode-wollok.js
diff --git a/src-min/ace.js b/src-min/ace.js
diff --git a/src-min/keybinding-vim.js b/src-min/keybinding-vim.js
diff --git a/src-min/mode-coldfusion.js b/src-min/mode-coldfusion.js
diff --git a/src-min/mode-csound_document.js b/src-min/mode-csound_document.js
diff --git a/src-min/mode-curly.js b/src-min/mode-curly.js
diff --git a/src-min/mode-django.js b/src-min/mode-django.js
diff --git a/src-min/mode-ejs.js b/src-min/mode-ejs.js
diff --git a/src-min/mode-ftl.js b/src-min/mode-ftl.js
diff --git a/src-min/mode-gobstones.js b/src-min/mode-gobstones.js
diff --git a/src-min/mode-groovy.js b/src-min/mode-groovy.js
diff --git a/src-min/mode-haml.js b/src-min/mode-haml.js
diff --git a/src-min/mode-handlebars.js b/src-min/mode-handlebars.js
diff --git a/src-min/mode-html.js b/src-min/mode-html.js
diff --git a/src-min/mode-html_elixir.js b/src-min/mode-html_elixir.js
diff --git a/src-min/mode-html_ruby.js b/src-min/mode-html_ruby.js
diff --git a/src-min/mode-jade.js b/src-min/mode-jade.js
diff --git a/src-min/mode-java.js b/src-min/mode-java.js
diff --git a/src-min/mode-javascript.js b/src-min/mode-javascript.js
diff --git a/src-min/mode-jsp.js b/src-min/mode-jsp.js
diff --git a/src-min/mode-latte.js b/src-min/mode-latte.js
diff --git a/src-min/mode-liquid.js b/src-min/mode-liquid.js
diff --git a/src-min/mode-luapage.js b/src-min/mode-luapage.js
diff --git a/src-min/mode-markdown.js b/src-min/mode-markdown.js
diff --git a/src-min/mode-mask.js b/src-min/mode-mask.js
diff --git a/src-min/mode-nunjucks.js b/src-min/mode-nunjucks.js
diff --git a/src-min/mode-pgsql.js b/src-min/mode-pgsql.js
diff --git a/src-min/mode-php.js b/src-min/mode-php.js
diff --git a/src-min/mode-php_laravel_blade.js b/src-min/mode-php_laravel_blade.js
diff --git a/src-min/mode-razor.js b/src-min/mode-razor.js
diff --git a/src-min/mode-rhtml.js b/src-min/mode-rhtml.js
diff --git a/src-min/mode-scala.js b/src-min/mode-scala.js
diff --git a/src-min/mode-sjs.js b/src-min/mode-sjs.js
diff --git a/src-min/mode-slim.js b/src-min/mode-slim.js
diff --git a/src-min/mode-smarty.js b/src-min/mode-smarty.js
diff --git a/src-min/mode-soy_template.js b/src-min/mode-soy_template.js
diff --git a/src-min/mode-svg.js b/src-min/mode-svg.js
diff --git a/src-min/mode-tsx.js b/src-min/mode-tsx.js
diff --git a/src-min/mode-twig.js b/src-min/mode-twig.js
diff --git a/src-min/mode-typescript.js b/src-min/mode-typescript.js
diff --git a/src-min/mode-velocity.js b/src-min/mode-velocity.js
diff --git a/src-min/mode-visualforce.js b/src-min/mode-visualforce.js
diff --git a/src-min/mode-wollok.js b/src-min/mode-wollok.js
diff --git a/src-noconflict/ace.js b/src-noconflict/ace.js
@@ -1180,7 +1180,7 @@ var reportErrorIfPathIsNotConfigured = function () {
         reportErrorIfPathIsNotConfigured = function () { };
     }
 };
-exports.version = "1.13.1";
+exports.version = "1.13.2";
 
 });
 
@@ -14734,7 +14734,7 @@ var Marker = function (parentEl) {
         var selections = this.session.$bidiHandler.getSelections(range.start.column, range.end.column);
         selections.forEach(function (selection) {
             this.elt(clazz, "height:" + height + "px;" +
-                "width:" + selection.width + (extraLength || 0) + "px;" +
+                "width:" + (selection.width + (extraLength || 0)) + "px;" +
                 "top:" + top + "px;" +
                 "left:" + (padding + selection.left) + "px;" + (extraStyle || ""));
         }, this);
@@ -17097,37 +17097,43 @@ var VirtualRenderer = function (container, theme) {
         if (this.$size.scrollerHeight === 0)
             return;
         var pos = this.$cursorLayer.getPixelPosition(cursor);
-        var left = pos.left;
-        var top = pos.top;
+        var newLeft = pos.left;
+        var newTop = pos.top;
         var topMargin = $viewMargin && $viewMargin.top || 0;
         var bottomMargin = $viewMargin && $viewMargin.bottom || 0;
         if (this.$scrollAnimation) {
             this.$stopAnimation = true;
         }
-        var scrollTop = this.$scrollAnimation ? this.session.getScrollTop() : this.scrollTop;
-        if (scrollTop + topMargin > top) {
-            if (offset && scrollTop + topMargin > top + this.lineHeight)
-                top -= offset * this.$size.scrollerHeight;
-            if (top === 0)
-                top = -this.scrollMargin.top;
-            this.session.setScrollTop(top);
-        }
-        else if (scrollTop + this.$size.scrollerHeight - bottomMargin < top + this.lineHeight) {
-            if (offset && scrollTop + this.$size.scrollerHeight - bottomMargin < top - this.lineHeight)
-                top += offset * this.$size.scrollerHeight;
-            this.session.setScrollTop(top + this.lineHeight + bottomMargin - this.$size.scrollerHeight);
-        }
-        var scrollLeft = this.scrollLeft;
-        if (scrollLeft > left) {
-            if (left < this.$padding + 2 * this.layerConfig.characterWidth)
-                left = -this.scrollMargin.left;
-            this.session.setScrollLeft(left);
-        }
-        else if (scrollLeft + this.$size.scrollerWidth < left + this.characterWidth) {
-            this.session.setScrollLeft(Math.round(left + this.characterWidth - this.$size.scrollerWidth));
-        }
-        else if (scrollLeft <= this.$padding && left - scrollLeft < this.characterWidth) {
-            this.session.setScrollLeft(0);
+        var currentTop = this.$scrollAnimation ? this.session.getScrollTop() : this.scrollTop;
+        if (currentTop + topMargin > newTop) {
+            if (offset && currentTop + topMargin > newTop + this.lineHeight)
+                newTop -= offset * this.$size.scrollerHeight;
+            if (newTop === 0)
+                newTop = -this.scrollMargin.top;
+            this.session.setScrollTop(newTop);
+        }
+        else if (currentTop + this.$size.scrollerHeight - bottomMargin < newTop + this.lineHeight) {
+            if (offset && currentTop + this.$size.scrollerHeight - bottomMargin < newTop - this.lineHeight)
+                newTop += offset * this.$size.scrollerHeight;
+            this.session.setScrollTop(newTop + this.lineHeight + bottomMargin - this.$size.scrollerHeight);
+        }
+        var currentLeft = this.scrollLeft;
+        var twoCharsWidth = 2 * this.layerConfig.characterWidth;
+        if (newLeft - twoCharsWidth < currentLeft) {
+            newLeft -= twoCharsWidth;
+            if (newLeft < this.$padding + twoCharsWidth) {
+                newLeft = -this.scrollMargin.left;
+            }
+            this.session.setScrollLeft(newLeft);
+        }
+        else {
+            newLeft += twoCharsWidth;
+            if (currentLeft + this.$size.scrollerWidth < newLeft + this.characterWidth) {
+                this.session.setScrollLeft(Math.round(newLeft + this.characterWidth - this.$size.scrollerWidth));
+            }
+            else if (currentLeft <= this.$padding && newLeft - currentLeft < this.characterWidth) {
+                this.session.setScrollLeft(0);
+            }
         }
     };
     this.getScrollTop = function () {

diff --git a/src-noconflict/keybinding-vim.js b/src-noconflict/keybinding-vim.js
@@ -280,7 +280,7 @@ CodeMirror.isWordChar = function (ch) {
         var result = fn();
         if (this.ace.curOp && this.ace.curOp.command.name == "vim") {
             if (this.state.dialog)
-                this.ace.curOp.command.scrollIntoView = false;
+                this.ace.curOp.command.scrollIntoView = this.ace.curOp.vimDialogScroll;
             this.ace.endOperation();
             if (!curOp.cursorActivity && !curOp.lastChange && prevOp)
                 this.ace.prevOp = prevOp;
@@ -2438,6 +2438,8 @@ var commandDispatcher = {
                     : newAnchor);
             }
             else if (!operator) {
+                if (cm.ace.curOp)
+                    cm.ace.curOp.vimDialogScroll = "center-animate"; // ace_patch
                 newHead = clipCursorToContent(cm, newHead, oldHead);
                 cm.setCursor(newHead.line, newHead.ch);
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
         <meta name="author" content="Fabian Jakobs">
         <!--
         Ace
-          version 1.13.1
+          version 1.13.2
           commit
         -->
@@ Expand Down @@