Skip to content

Commit

Permalink
package 23.04.24
Browse files Browse the repository at this point in the history
  • Loading branch information
akoreman committed Apr 23, 2024
1 parent 2bf49c6 commit 98d379e
Show file tree
Hide file tree
Showing 203 changed files with 22,991 additions and 12,978 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion demo/kitchen-sink/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src-min-noconflict/ace.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/ext-inline_autocomplete.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/ext-language_tools.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/ext-prompt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-astro.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-coldfusion.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-csound_document.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-curly.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-django.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-ejs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-ftl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-gobstones.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-groovy.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-haml.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-handlebars.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-html.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-html_elixir.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-html_ruby.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-jade.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-java.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-javascript.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-jsoniq.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-jsp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-jsx.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-latte.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-liquid.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-luapage.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-markdown.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-mask.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-nunjucks.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-pgsql.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-php.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-php_laravel_blade.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-razor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-rhtml.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-scala.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-sjs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-slim.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-smarty.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-soy_template.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-svg.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-tsx.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-twig.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-typescript.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-velocity.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-visualforce.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-vue.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-wollok.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-xml.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-xquery.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/ace.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/ext-inline_autocomplete.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/ext-language_tools.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/ext-prompt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-astro.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-coldfusion.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-csound_document.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-curly.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-django.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-ejs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-ftl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-gobstones.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-groovy.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-haml.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-handlebars.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-html.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-html_elixir.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-html_ruby.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-jade.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-java.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-javascript.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-jsoniq.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-jsp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-jsx.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-latte.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-liquid.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-luapage.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-markdown.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-mask.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-nunjucks.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-pgsql.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-php.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-php_laravel_blade.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-razor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-rhtml.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-scala.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-sjs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-slim.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-smarty.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-soy_template.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-svg.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-tsx.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-twig.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-typescript.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-velocity.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-visualforce.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-vue.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-wollok.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-xml.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-xquery.js

Large diffs are not rendered by default.

36 changes: 31 additions & 5 deletions src-noconflict/ace.js
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@ var reportErrorIfPathIsNotConfigured = function () {
reportErrorIfPathIsNotConfigured = function () { };
}
};
exports.version = "1.33.0";
exports.version = "1.33.1";

});

Expand Down Expand Up @@ -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, "}");
Expand Down Expand Up @@ -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) {
Expand All @@ -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 >
}
Expand Down Expand Up @@ -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 >
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src-noconflict/ext-inline_autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src-noconflict/ext-language_tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src-noconflict/ext-prompt.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading

0 comments on commit 98d379e

Please sign in to comment.