Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ajaxorg/ace-builds
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.24.0
Choose a base ref
...
head repository: ajaxorg/ace-builds
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.24.1
Choose a head ref
  • 1 commit
  • 26 files changed
  • 1 contributor

Commits on Aug 15, 2023

  1. package 15.08.23

    @nightwing
    nightwing committed Aug 15, 2023
    Copy the full SHA
    d065fe8 View commit details
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@

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.24.1](https://github.com/ajaxorg/ace/compare/v1.24.0...v1.24.1) (2023-08-15)

## [1.24.0](https://github.com/ajaxorg/ace/compare/v1.23.4...v1.24.0) (2023-08-09)


6 changes: 3 additions & 3 deletions ace-modules.d.ts
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,6 @@ declare module 'ace-builds/src-noconflict/mode-autohotkey';
declare module 'ace-builds/src-noconflict/mode-batchfile';
declare module 'ace-builds/src-noconflict/mode-bibtex';
declare module 'ace-builds/src-noconflict/mode-c9search';
declare module 'ace-builds/src-noconflict/mode-c_cpp';
declare module 'ace-builds/src-noconflict/mode-cirru';
declare module 'ace-builds/src-noconflict/mode-clojure';
declare module 'ace-builds/src-noconflict/mode-cobol';
@@ -60,6 +59,7 @@ declare module 'ace-builds/src-noconflict/mode-csp';
declare module 'ace-builds/src-noconflict/mode-css';
declare module 'ace-builds/src-noconflict/mode-curly';
declare module 'ace-builds/src-noconflict/mode-cuttlefish';
declare module 'ace-builds/src-noconflict/mode-c_cpp';
declare module 'ace-builds/src-noconflict/mode-d';
declare module 'ace-builds/src-noconflict/mode-dart';
declare module 'ace-builds/src-noconflict/mode-diff';
@@ -240,8 +240,8 @@ declare module 'ace-builds/src-noconflict/theme-kr_theme';
declare module 'ace-builds/src-noconflict/theme-kuroir';
declare module 'ace-builds/src-noconflict/theme-merbivore';
declare module 'ace-builds/src-noconflict/theme-merbivore_soft';
declare module 'ace-builds/src-noconflict/theme-mono_industrial';
declare module 'ace-builds/src-noconflict/theme-monokai';
declare module 'ace-builds/src-noconflict/theme-mono_industrial';
declare module 'ace-builds/src-noconflict/theme-nord_dark';
declare module 'ace-builds/src-noconflict/theme-one_dark';
declare module 'ace-builds/src-noconflict/theme-pastel_on_dark';
@@ -274,7 +274,6 @@ declare module 'ace-builds/src-noconflict/snippets/autohotkey';
declare module 'ace-builds/src-noconflict/snippets/batchfile';
declare module 'ace-builds/src-noconflict/snippets/bibtex';
declare module 'ace-builds/src-noconflict/snippets/c9search';
declare module 'ace-builds/src-noconflict/snippets/c_cpp';
declare module 'ace-builds/src-noconflict/snippets/cirru';
declare module 'ace-builds/src-noconflict/snippets/clojure';
declare module 'ace-builds/src-noconflict/snippets/cobol';
@@ -289,6 +288,7 @@ declare module 'ace-builds/src-noconflict/snippets/csp';
declare module 'ace-builds/src-noconflict/snippets/css';
declare module 'ace-builds/src-noconflict/snippets/curly';
declare module 'ace-builds/src-noconflict/snippets/cuttlefish';
declare module 'ace-builds/src-noconflict/snippets/c_cpp';
declare module 'ace-builds/src-noconflict/snippets/d';
declare module 'ace-builds/src-noconflict/snippets/dart';
declare module 'ace-builds/src-noconflict/snippets/diff';
62 changes: 29 additions & 33 deletions demo/kitchen-sink/demo.js
View file
Original file line number Diff line number Diff line change
@@ -4891,9 +4891,6 @@ var SnippetManager = /** @class */ (function () {
if (options === void 0) { options = {}; }
var processedSnippet = processSnippetText.call(this, editor, snippetText, options);
var range = editor.getSelectionRange();
if (options.range && options.range.compareRange(range) === 0) {
range = options.range;
}
var end = editor.session.replace(range, processedSnippet.text);
var tabstopManager = new TabstopManager(editor);
var selectionId = editor.inVirtualSelectionMode && editor.selection.index;
@@ -4902,8 +4899,6 @@ var SnippetManager = /** @class */ (function () {
SnippetManager.prototype.insertSnippet = function (editor, snippetText, options) {
if (options === void 0) { options = {}; }
var self = this;
if (options.range && !(options.range instanceof Range))
options.range = Range.fromPoints(options.range.start, options.range.end);
if (editor.inVirtualSelectionMode)
return self.insertSnippetForSelection(editor, snippetText, options);
editor.forEachSelection(function () {
@@ -5870,9 +5865,9 @@ var Autocomplete = /** @class */ (function () {
editor.on("mousewheel", this.mousewheelListener);
this.updateCompletions(false, options);
};
Autocomplete.prototype.getCompletionProvider = function () {
Autocomplete.prototype.getCompletionProvider = function (initialPosition) {
if (!this.completionProvider)
this.completionProvider = new CompletionProvider();
this.completionProvider = new CompletionProvider(initialPosition);
return this.completionProvider;
};
Autocomplete.prototype.gatherCompletions = function (editor, callback) {
@@ -5907,7 +5902,10 @@ var Autocomplete = /** @class */ (function () {
this.base = session.doc.createAnchor(pos.row, pos.column - prefix.length);
this.base.$insertRight = true;
var completionOptions = { exactMatch: this.exactMatch };
this.getCompletionProvider().provideCompletions(this.editor, completionOptions, function (err, completions, finished) {
this.getCompletionProvider({
prefix: prefix,
pos: pos
}).provideCompletions(this.editor, completionOptions, function (err, completions, finished) {
var filtered = completions.filtered;
var prefix = util.getCompletionPrefix(this.editor);
if (finished) {
@@ -6102,7 +6100,8 @@ Autocomplete.startCommand = {
bindKey: "Ctrl-Space|Ctrl-Shift-Space|Alt-Space"
};
var CompletionProvider = /** @class */ (function () {
function CompletionProvider() {
function CompletionProvider(initialPosition) {
this.initialPosition = initialPosition;
this.active = true;
}
CompletionProvider.prototype.insertByIndex = function (editor, index, options) {
@@ -6121,7 +6120,14 @@ var CompletionProvider = /** @class */ (function () {
else {
if (!this.completions)
return false;
if (this.completions.filterText) {
var replaceBefore = this.completions.filterText.length;
var replaceAfter = 0;
if (data.range && data.range.start.row === data.range.end.row) {
replaceBefore -= this.initialPosition.prefix.length;
replaceBefore += this.initialPosition.pos.column - data.range.start.column;
replaceAfter += data.range.end.column - this.initialPosition.pos.column;
}
if (replaceBefore || replaceAfter) {
var ranges;
if (editor.selection.getAllRanges) {
ranges = editor.selection.getAllRanges();
@@ -6130,12 +6136,14 @@ var CompletionProvider = /** @class */ (function () {
ranges = [editor.getSelectionRange()];
}
for (var i = 0, range; range = ranges[i]; i++) {
range.start.column -= this.completions.filterText.length;
range.start.column -= replaceBefore;
range.end.column += replaceAfter;
editor.session.remove(range);
}
}
if (data.snippet)
snippetManager.insertSnippet(editor, data.snippet, { range: data.range });
if (data.snippet) {
snippetManager.insertSnippet(editor, data.snippet);
}
else {
this.$insertString(editor, data);
}
@@ -6148,23 +6156,7 @@ var CompletionProvider = /** @class */ (function () {
};
CompletionProvider.prototype.$insertString = function (editor, data) {
var text = data.value || data;
if (data.range) {
if (editor.inVirtualSelectionMode) {
return editor.session.replace(data.range, text);
}
editor.forEachSelection(function () {
var range = editor.getSelectionRange();
if (data.range.compareRange(range) === 0) {
editor.session.replace(data.range, text);
}
else {
editor.insert(text);
}
}, null, { keepOrder: true });
}
else {
editor.execCommand("insertstring", text);
}
editor.execCommand("insertstring", text);
};
CompletionProvider.prototype.gatherCompletions = function (editor, callback) {
var session = editor.getSession();
@@ -7491,9 +7483,9 @@ var InlineAutocomplete = /** @class */ (function () {
this.$showCompletion();
}
};
InlineAutocomplete.prototype.getCompletionProvider = function () {
InlineAutocomplete.prototype.getCompletionProvider = function (initialPosition) {
if (!this.completionProvider)
this.completionProvider = new CompletionProvider();
this.completionProvider = new CompletionProvider(initialPosition);
return this.completionProvider;
};
InlineAutocomplete.prototype.$showCompletion = function () {
@@ -7538,7 +7530,11 @@ var InlineAutocomplete = /** @class */ (function () {
exactMatch: true,
ignoreCaption: true
};
this.getCompletionProvider().provideCompletions(this.editor, options, function (err, completions, finished) {
this.getCompletionProvider({
prefix: prefix,
base: this.base,
pos: pos
}).provideCompletions(this.editor, options, function (err, completions, finished) {
var filtered = completions.filtered;
var prefix = util.getCompletionPrefix(this.editor);
if (finished) {
6 changes: 3 additions & 3 deletions esm-resolver.js
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,6 @@ ace.config.setModuleLoader('ace/mode/autohotkey', () => import('./src-noconflict
ace.config.setModuleLoader('ace/mode/batchfile', () => import('./src-noconflict/mode-batchfile.js'));
ace.config.setModuleLoader('ace/mode/bibtex', () => import('./src-noconflict/mode-bibtex.js'));
ace.config.setModuleLoader('ace/mode/c9search', () => import('./src-noconflict/mode-c9search.js'));
ace.config.setModuleLoader('ace/mode/c_cpp', () => import('./src-noconflict/mode-c_cpp.js'));
ace.config.setModuleLoader('ace/mode/cirru', () => import('./src-noconflict/mode-cirru.js'));
ace.config.setModuleLoader('ace/mode/clojure', () => import('./src-noconflict/mode-clojure.js'));
ace.config.setModuleLoader('ace/mode/cobol', () => import('./src-noconflict/mode-cobol.js'));
@@ -57,6 +56,7 @@ ace.config.setModuleLoader('ace/mode/csp', () => import('./src-noconflict/mode-c
ace.config.setModuleLoader('ace/mode/css', () => import('./src-noconflict/mode-css.js'));
ace.config.setModuleLoader('ace/mode/curly', () => import('./src-noconflict/mode-curly.js'));
ace.config.setModuleLoader('ace/mode/cuttlefish', () => import('./src-noconflict/mode-cuttlefish.js'));
ace.config.setModuleLoader('ace/mode/c_cpp', () => import('./src-noconflict/mode-c_cpp.js'));
ace.config.setModuleLoader('ace/mode/d', () => import('./src-noconflict/mode-d.js'));
ace.config.setModuleLoader('ace/mode/dart', () => import('./src-noconflict/mode-dart.js'));
ace.config.setModuleLoader('ace/mode/diff', () => import('./src-noconflict/mode-diff.js'));
@@ -237,8 +237,8 @@ ace.config.setModuleLoader('ace/theme/kr_theme', () => import('./src-noconflict/
ace.config.setModuleLoader('ace/theme/kuroir', () => import('./src-noconflict/theme-kuroir.js'));
ace.config.setModuleLoader('ace/theme/merbivore', () => import('./src-noconflict/theme-merbivore.js'));
ace.config.setModuleLoader('ace/theme/merbivore_soft', () => import('./src-noconflict/theme-merbivore_soft.js'));
ace.config.setModuleLoader('ace/theme/mono_industrial', () => import('./src-noconflict/theme-mono_industrial.js'));
ace.config.setModuleLoader('ace/theme/monokai', () => import('./src-noconflict/theme-monokai.js'));
ace.config.setModuleLoader('ace/theme/mono_industrial', () => import('./src-noconflict/theme-mono_industrial.js'));
ace.config.setModuleLoader('ace/theme/nord_dark', () => import('./src-noconflict/theme-nord_dark.js'));
ace.config.setModuleLoader('ace/theme/one_dark', () => import('./src-noconflict/theme-one_dark.js'));
ace.config.setModuleLoader('ace/theme/pastel_on_dark', () => import('./src-noconflict/theme-pastel_on_dark.js'));
@@ -282,7 +282,6 @@ ace.config.setModuleLoader('ace/snippets/autohotkey', () => import('./src-noconf
ace.config.setModuleLoader('ace/snippets/batchfile', () => import('./src-noconflict/snippets/batchfile.js'));
ace.config.setModuleLoader('ace/snippets/bibtex', () => import('./src-noconflict/snippets/bibtex.js'));
ace.config.setModuleLoader('ace/snippets/c9search', () => import('./src-noconflict/snippets/c9search.js'));
ace.config.setModuleLoader('ace/snippets/c_cpp', () => import('./src-noconflict/snippets/c_cpp.js'));
ace.config.setModuleLoader('ace/snippets/cirru', () => import('./src-noconflict/snippets/cirru.js'));
ace.config.setModuleLoader('ace/snippets/clojure', () => import('./src-noconflict/snippets/clojure.js'));
ace.config.setModuleLoader('ace/snippets/cobol', () => import('./src-noconflict/snippets/cobol.js'));
@@ -297,6 +296,7 @@ ace.config.setModuleLoader('ace/snippets/csp', () => import('./src-noconflict/sn
ace.config.setModuleLoader('ace/snippets/css', () => import('./src-noconflict/snippets/css.js'));
ace.config.setModuleLoader('ace/snippets/curly', () => import('./src-noconflict/snippets/curly.js'));
ace.config.setModuleLoader('ace/snippets/cuttlefish', () => import('./src-noconflict/snippets/cuttlefish.js'));
ace.config.setModuleLoader('ace/snippets/c_cpp', () => import('./src-noconflict/snippets/c_cpp.js'));
ace.config.setModuleLoader('ace/snippets/d', () => import('./src-noconflict/snippets/d.js'));
ace.config.setModuleLoader('ace/snippets/dart', () => import('./src-noconflict/snippets/dart.js'));
ace.config.setModuleLoader('ace/snippets/diff', () => import('./src-noconflict/snippets/diff.js'));
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "ace-builds",
"main": "./src-noconflict/ace.js",
"typings": "ace.d.ts",
"version": "1.24.0",
"version": "1.24.1",
"description": "Ace (Ajax.org Cloud9 Editor)",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
2 changes: 1 addition & 1 deletion src-min-noconflict/ace.js
View file

Large diffs are not rendered by default.

Loading