package 23.04.24

ajaxorg · Apr 23, 2024 · 98d379e · 98d379e
1 parent 2bf49c6
commit 98d379e
Show file tree

Hide file tree

Showing 203 changed files with 22,991 additions and 12,978 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 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.33.1](https://github.com/ajaxorg/ace/compare/v1.33.0...v1.33.1) (2024-04-23)
+
+
+### Bug Fixes
+
+* account for `this.popup` being potentially undefined in completion mousewheel listener ([#5537](https://github.com/ajaxorg/ace/issues/5537)) ([6c3a9a6](https://github.com/ajaxorg/ace/commit/6c3a9a66a7a0ab0dd493ad2c281c9dd343d5301f))
+
 ## [1.33.0](https://github.com/ajaxorg/ace/compare/v1.32.9...v1.33.0) (2024-04-12)
 
 

diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
@@ -6027,7 +6027,7 @@ var Autocomplete = /** @class */ (function () {
         this.detach();
     };
     Autocomplete.prototype.mousewheelListener = function (e) {
-        if (!this.popup.isMouseOver)
+        if (this.popup && !this.popup.isMouseOver)
             this.detach();
     };
     Autocomplete.prototype.mouseOutListener = function (e) {

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.33.0",
+    "version": "1.33.1",
     "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/ext-inline_autocomplete.js b/src-min-noconflict/ext-inline_autocomplete.js
diff --git a/src-min-noconflict/ext-language_tools.js b/src-min-noconflict/ext-language_tools.js
diff --git a/src-min-noconflict/ext-prompt.js b/src-min-noconflict/ext-prompt.js
diff --git a/src-min-noconflict/mode-astro.js b/src-min-noconflict/mode-astro.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-jsoniq.js b/src-min-noconflict/mode-jsoniq.js
diff --git a/src-min-noconflict/mode-jsp.js b/src-min-noconflict/mode-jsp.js
diff --git a/src-min-noconflict/mode-jsx.js b/src-min-noconflict/mode-jsx.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-vue.js b/src-min-noconflict/mode-vue.js
diff --git a/src-min-noconflict/mode-wollok.js b/src-min-noconflict/mode-wollok.js
diff --git a/src-min-noconflict/mode-xml.js b/src-min-noconflict/mode-xml.js
diff --git a/src-min-noconflict/mode-xquery.js b/src-min-noconflict/mode-xquery.js
diff --git a/src-min/ace.js b/src-min/ace.js
diff --git a/src-min/ext-inline_autocomplete.js b/src-min/ext-inline_autocomplete.js
diff --git a/src-min/ext-language_tools.js b/src-min/ext-language_tools.js
diff --git a/src-min/ext-prompt.js b/src-min/ext-prompt.js
diff --git a/src-min/mode-astro.js b/src-min/mode-astro.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-jsoniq.js b/src-min/mode-jsoniq.js
diff --git a/src-min/mode-jsp.js b/src-min/mode-jsp.js
diff --git a/src-min/mode-jsx.js b/src-min/mode-jsx.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-vue.js b/src-min/mode-vue.js
diff --git a/src-min/mode-wollok.js b/src-min/mode-wollok.js
diff --git a/src-min/mode-xml.js b/src-min/mode-xml.js
diff --git a/src-min/mode-xquery.js b/src-min/mode-xquery.js
diff --git a/src-noconflict/ace.js b/src-noconflict/ace.js
@@ -1304,7 +1304,7 @@ var reportErrorIfPathIsNotConfigured = function () {
         reportErrorIfPathIsNotConfigured = function () { };
     }
 };
-exports.version = "1.33.0";
+exports.version = "1.33.1";
 
 });
 
@@ -6420,9 +6420,23 @@ CstyleBehaviour = function (options) {
             initContext(editor);
             var selection = editor.getSelectionRange();
             var selected = session.doc.getTextRange(selection);
+            var token = session.getTokenAt(cursor.row, cursor.column);
             if (selected !== "" && selected !== "{" && editor.getWrapBehavioursEnabled()) {
                 return getWrapped(selection, selected, '{', '}');
             }
+            else if (token && /(?:string)\.quasi|\.xml/.test(token.type)) {
+                var excludeTokens = [
+                    /tag\-(?:open|name)/, /attribute\-name/
+                ];
+                if (excludeTokens.some(function (el) { return el.test(token.type); }) || /(string)\.quasi/.test(token.type)
+                    && token.value[cursor.column - token.start - 1] !== '$')
+                    return;
+                CstyleBehaviour.recordAutoInsert(editor, session, "}");
+                return {
+                    text: '{}',
+                    selection: [1, 1]
+                };
+            }
             else if (CstyleBehaviour.isSaneInsertion(editor, session)) {
                 if (/[\]\}\)]/.test(line[cursor.column]) || editor.inMultiSelectMode || options.braces) {
                     CstyleBehaviour.recordAutoInsert(editor, session, "}");
@@ -9730,6 +9744,10 @@ function BracketMatch() {
         var foundOpenTagEnd = false;
         do {
             prevToken = token;
+            if (prevToken.type.indexOf('tag-close') !== -1 && !foundOpenTagEnd) {
+                var openTagEnd = new Range(iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn(), iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn() + 1); //Range for `>`
+                foundOpenTagEnd = true;
+            }
             token = iterator.stepForward();
             if (token) {
                 if (token.value === '>' && !foundOpenTagEnd) {
@@ -9749,7 +9767,9 @@ function BracketMatch() {
                                 var closeTagStart = new Range(iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn(), iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn() + 2); //Range for </
                                 token = iterator.stepForward();
                                 var closeTagName = new Range(iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn(), iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn() + token.value.length);
-                                token = iterator.stepForward();
+                                if (token.type.indexOf('tag-close') === -1) {
+                                    token = iterator.stepForward();
+                                }
                                 if (token && token.value === '>') {
                                     var closeTagEnd = new Range(iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn(), iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn() + 1); //Range for >
                                 }
@@ -9790,7 +9810,9 @@ function BracketMatch() {
         var closeTagStart = new Range(startRow, startColumn, startRow, endColumn); //Range for </
         iterator.stepForward();
         var closeTagName = new Range(iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn(), iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn() + token.value.length);
-        token = iterator.stepForward();
+        if (token.type.indexOf('tag-close') === -1) {
+            token = iterator.stepForward();
+        }
         if (!token || token.value !== ">")
             return;
         var closeTagEnd = new Range(iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn(), iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn() + 1); //Range for >
@@ -14043,8 +14065,12 @@ var Editor = /** @class */ (function () {
                 var token = iterator.getCurrentToken();
                 if (token && /\b(?:tag-open|tag-name)/.test(token.type)) {
                     var tagNamesRanges = session.getMatchingTags(pos);
-                    if (tagNamesRanges)
-                        ranges = [tagNamesRanges.openTagName, tagNamesRanges.closeTagName];
+                    if (tagNamesRanges) {
+                        ranges = [
+                            tagNamesRanges.openTagName.isEmpty() ? tagNamesRanges.openTag : tagNamesRanges.openTagName,
+                            tagNamesRanges.closeTagName.isEmpty() ? tagNamesRanges.closeTag : tagNamesRanges.closeTagName
+                        ];
+                    }
                 }
             }
             if (!ranges && session.$mode.getMatching)

diff --git a/src-noconflict/ext-inline_autocomplete.js b/src-noconflict/ext-inline_autocomplete.js
@@ -1806,7 +1806,7 @@ var Autocomplete = /** @class */ (function () {
         this.detach();
     };
     Autocomplete.prototype.mousewheelListener = function (e) {
-        if (!this.popup.isMouseOver)
+        if (this.popup && !this.popup.isMouseOver)
             this.detach();
     };
     Autocomplete.prototype.mouseOutListener = function (e) {

diff --git a/src-noconflict/ext-language_tools.js b/src-noconflict/ext-language_tools.js
@@ -1806,7 +1806,7 @@ var Autocomplete = /** @class */ (function () {
         this.detach();
     };
     Autocomplete.prototype.mousewheelListener = function (e) {
-        if (!this.popup.isMouseOver)
+        if (this.popup && !this.popup.isMouseOver)
             this.detach();
     };
     Autocomplete.prototype.mouseOutListener = function (e) {

diff --git a/src-noconflict/ext-prompt.js b/src-noconflict/ext-prompt.js
@@ -1806,7 +1806,7 @@ var Autocomplete = /** @class */ (function () {
         this.detach();
     };
     Autocomplete.prototype.mousewheelListener = function (e) {
-        if (!this.popup.isMouseOver)
+        if (this.popup && !this.popup.isMouseOver)
             this.detach();
     };
     Autocomplete.prototype.mouseOutListener = function (e) {