WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit a7af3fc

Browse files
committed
Merge branch 'master' into better-declarations
# Conflicts: # Makefile.dryice.js # ace-internal.d.ts # ace.d.ts # src/autocomplete.js # tool/ace_declaration_generator.js # types/ace-ext.d.ts # types/ace-lib.d.ts # types/ace-modules.d.ts
2 parents c51407e + c41e5be commit a7af3fc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+2848
-986
lines changed

.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ demo/
2121
api/
2222
**/* *
2323
**/node_modules
24-
0*
24+
0*
25+
esm-resolver.js
Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
---
2-
name: "🌐 Add a project to the list of project using Ace on its website."
3-
description: Add a project to the list of projects using Ace, displayed on the website.
4-
title: "Add project (project name) to the list of projects using Ace on its website"
5-
labels: [website, needs-triage]
6-
assignees: []
7-
body:
8-
- type: markdown
9-
attributes:
10-
value: |
11-
The fastest way to get your project to be displayed on the website is to create a PR.
12-
Examples: https://github.com/ajaxorg/ace/pull/5014, https://github.com/ajaxorg/ace/pull/5222.
13-
If for any reason creating a PR is not an option for you, please proceed with filling out this issue. Thanks!
14-
- type: input
15-
id: name
16-
attributes:
17-
label: Project name
18-
description: A name of the project to be used on Ace website.
19-
validations:
20-
required: true
21-
- type: input
22-
id: project-link
23-
attributes:
24-
label: Project link
25-
description: A link to the project's website.
26-
validations:
27-
required: true
28-
- type: input
29-
id: logo-link
30-
attributes:
31-
label: Logo link
32-
description: |
33-
A link to the logo image to be used on the website for the project. If not provided, only the name of the project will be displayed.
34-
35-
By submitting this link, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
36-
validations:
37-
required: false
38-
- type: textarea
39-
id: info
40-
attributes:
41-
label: Additional information
42-
description: Any additional information you would like to share.
43-
validations:
44-
required: false
45-
- type: checkboxes
46-
id: ack
47-
attributes:
48-
label: Acknowledgements
49-
options:
50-
- label: I may be able to implement this request.
51-
required: false
1+
---
2+
name: "🌐 Add a project to the list of project using Ace on its website."
3+
description: Add a project to the list of projects using Ace, displayed on the website.
4+
title: "Add project (project name) to the list of projects using Ace on its website"
5+
labels: [website, needs-triage]
6+
assignees: []
7+
body:
8+
- type: markdown
9+
attributes:
10+
value: |
11+
The fastest way to get your project to be displayed on the website is to create a PR.
12+
Examples: https://github.com/ajaxorg/ace/pull/5014, https://github.com/ajaxorg/ace/pull/5222.
13+
If for any reason creating a PR is not an option for you, please proceed with filling out this issue. Thanks!
14+
- type: input
15+
id: name
16+
attributes:
17+
label: Project name
18+
description: A name of the project to be used on Ace website.
19+
validations:
20+
required: true
21+
- type: input
22+
id: project-link
23+
attributes:
24+
label: Project link
25+
description: A link to the project's website.
26+
validations:
27+
required: true
28+
- type: input
29+
id: logo-link
30+
attributes:
31+
label: Logo link
32+
description: |
33+
A link to the logo image to be used on the website for the project. If not provided, only the name of the project will be displayed.
34+
35+
By submitting this link, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
36+
validations:
37+
required: false
38+
- type: textarea
39+
id: info
40+
attributes:
41+
label: Additional information
42+
description: Any additional information you would like to share.
43+
validations:
44+
required: false
45+
- type: checkboxes
46+
id: ack
47+
attributes:
48+
label: Acknowledgements
49+
options:
50+
- label: I may be able to implement this request.
51+
required: false

.github/workflows/close-stale-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
# These labels are required
2727
stale-issue-label: closing-soon
28-
exempt-issue-labels: no-autoclose
28+
exempt-issue-labels: no-autoclose, p1
2929
response-requested-label: response-requested
3030

3131
# Don't set closed-for-staleness label to skip closing very old issues

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ npm-debug.log
2525
deps/
2626
dist
2727

28-
lib/ace
28+
lib/ace
29+
styles

CHANGELOG.md

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,92 @@
22

33
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.
44

5+
### [1.39.1](https://github.com/ajaxorg/ace/compare/v1.39.0...v1.39.1) (2025-03-20)
6+
7+
8+
### Features
9+
10+
* Editing is disabled tooltip in readonly mode ([#5771](https://github.com/ajaxorg/ace/issues/5771)) ([1098e53](https://github.com/ajaxorg/ace/commit/1098e5306fdc02e873cdadc85d2e13228abfe80c))
11+
12+
13+
### Bug Fixes
14+
15+
* Fix is check in xml FoldMode ([#5752](https://github.com/ajaxorg/ace/issues/5752)) ([810c465](https://github.com/ajaxorg/ace/commit/810c4650288d32b119239f7731a3b3be0c25376c))
16+
* replace NodeList.foreach with for loop ([#5769](https://github.com/ajaxorg/ace/issues/5769)) ([b3de3c1](https://github.com/ajaxorg/ace/commit/b3de3c1d99540bd94df122cedb7c5e3a792986a7))
17+
* updateDocTooltip with undefined this.completions ([#5754](https://github.com/ajaxorg/ace/issues/5754)) ([adde072](https://github.com/ajaxorg/ace/commit/adde072dd4810aa8f99bb1e16a6ab7dfc81a6e9d))
18+
* wrong java keywords ([#5759](https://github.com/ajaxorg/ace/issues/5759)) ([6b4c7a0](https://github.com/ajaxorg/ace/commit/6b4c7a09d844a2e16d664d3e9fbb384b543bcfcb))
19+
20+
## [1.39.0](https://github.com/ajaxorg/ace/compare/v1.38.0...v1.39.0) (2025-02-21)
21+
22+
23+
### Features
24+
25+
* Multiline Search Support: line breaks `\n` ([#5675](https://github.com/ajaxorg/ace/issues/5675)) ([06d51b9](https://github.com/ajaxorg/ace/commit/06d51b9164dc9dc39fbd6df26b7132f4b9580a4c))
26+
27+
28+
### Bug Fixes
29+
30+
* check if row is present when setting aria label of popup elements ([#5750](https://github.com/ajaxorg/ace/issues/5750)) ([ff16482](https://github.com/ajaxorg/ace/commit/ff16482101965fc4fce488a61a3cd0f9454d8e87))
31+
* gutter hover tooltip a11y improvements ([#5747](https://github.com/ajaxorg/ace/issues/5747)) ([fbe3ddc](https://github.com/ajaxorg/ace/commit/fbe3ddccb1248c9f8f4a6524d2ded7235d225b41))
32+
* narrowing platform to be either win or mac ([#5707](https://github.com/ajaxorg/ace/issues/5707)) ([18cc336](https://github.com/ajaxorg/ace/commit/18cc336187519107f47bb15e989008f48f0b1563))
33+
* set score completion item when skipfilter true ([#5749](https://github.com/ajaxorg/ace/issues/5749)) ([a27e1e8](https://github.com/ajaxorg/ace/commit/a27e1e8a5d3d912b3b554cd2b5916b58750e8e71))
34+
35+
## [1.38.0](https://github.com/ajaxorg/ace/compare/v1.37.5...v1.38.0) (2025-02-12)
36+
37+
38+
### Features
39+
40+
* **popup:** add supporting skipFilter flag for popup item ([#5740](https://github.com/ajaxorg/ace/issues/5740)) ([0db7585](https://github.com/ajaxorg/ace/commit/0db7585ae0ccbd353091426f60ac3d9e53e182c4))
41+
42+
43+
### Bug Fixes
44+
45+
* **AcePopup:** fix aria-posinset issue on google chrome ([#5719](https://github.com/ajaxorg/ace/issues/5719)) ([09a0c5a](https://github.com/ajaxorg/ace/commit/09a0c5a11106754916a4fc324a35e8daf84055ba))
46+
* calling setMode just before destroy causes error reading getLength ([#5727](https://github.com/ajaxorg/ace/issues/5727)) ([62b973e](https://github.com/ajaxorg/ace/commit/62b973ef2247debdd51cf6a41a3b24b97277efdb))
47+
* highlight indent guides with wrapped lines ([#5621](https://github.com/ajaxorg/ace/issues/5621)) ([77b9fe1](https://github.com/ajaxorg/ace/commit/77b9fe1bc0b10b4c3fb2780d65f9d256d60634ce))
48+
* improve aria attributes of popup elements ([#5739](https://github.com/ajaxorg/ace/issues/5739)) ([09fba2e](https://github.com/ajaxorg/ace/commit/09fba2e7347cd499c979e53ec7a8d8ee1fd48918))
49+
* types for setTimeout/setInterval calls ([#5726](https://github.com/ajaxorg/ace/issues/5726)) ([9a76656](https://github.com/ajaxorg/ace/commit/9a76656acc9528a4a2e92a3b72c4d6598d3a0a8c))
50+
* **VirtualRenderer:** fix scrollbar overlap on autocompletion ([#5713](https://github.com/ajaxorg/ace/issues/5713)) ([5acea6d](https://github.com/ajaxorg/ace/commit/5acea6d9200f4ca0c8495350cda6e41e8351913f))
51+
* wrong type of paste event and missing types for themelist extension ([#5725](https://github.com/ajaxorg/ace/issues/5725)) ([a4b9d2d](https://github.com/ajaxorg/ace/commit/a4b9d2d91a2be841320030d93afde46ae723c8c3))
52+
53+
### [1.37.5](https://github.com/ajaxorg/ace/compare/v1.37.4...v1.37.5) (2025-01-16)
54+
55+
56+
### Bug Fixes
57+
58+
* update aria-roledescription gutter ([#5718](https://github.com/ajaxorg/ace/issues/5718)) ([7ae3a4c](https://github.com/ajaxorg/ace/commit/7ae3a4c5f6f6e9bd31ae491f1fcef71fc5ae62fa))
59+
60+
### [1.37.4](https://github.com/ajaxorg/ace/compare/v1.37.3...v1.37.4) (2025-01-09)
61+
62+
63+
### Bug Fixes
64+
65+
* Remove unnecesary `typeof` from type imports in declarations ([#5715](https://github.com/ajaxorg/ace/issues/5715)) ([2c8bf91](https://github.com/ajaxorg/ace/commit/2c8bf916d75b086b958c205896bc2adc1747d241))
66+
67+
### [1.37.3](https://github.com/ajaxorg/ace/compare/v1.37.2...v1.37.3) (2025-01-07)
68+
69+
### [1.37.2](https://github.com/ajaxorg/ace/compare/v1.37.1...v1.37.2) (2025-01-06)
70+
71+
72+
### Bug Fixes
73+
74+
* fix return type of supportsFile modelist ([#5705](https://github.com/ajaxorg/ace/issues/5705)) ([de21d50](https://github.com/ajaxorg/ace/commit/de21d50656bd874e1626265b8853923cb8da7c8b))
75+
76+
### [1.37.1](https://github.com/ajaxorg/ace/compare/v1.37.0...v1.37.1) (2024-12-20)
77+
78+
79+
### Bug Fixes
80+
81+
* hide gutter tooltip event missing from editor signal ([#5701](https://github.com/ajaxorg/ace/issues/5701)) ([66a6736](https://github.com/ajaxorg/ace/commit/66a673643d5d128eaf59d4fb6e5907fa6fa68773))
82+
83+
### [1.36.6](https://github.com/ajaxorg/ace/compare/v1.36.5...v1.36.6) (2024-12-17)
84+
85+
86+
### Bug Fixes
87+
88+
* update contribuition guide to mandate test cases ([#5694](https://github.com/ajaxorg/ace/issues/5694)) ([e6533b3](https://github.com/ajaxorg/ace/commit/e6533b3972d5adbf5995646c44894466b3b7f40f))
89+
* wrong behaviour rules in modes ([#5682](https://github.com/ajaxorg/ace/issues/5682)) ([442680c](https://github.com/ajaxorg/ace/commit/442680c68e66531c2d5ac80d80444ed600262ec1))
90+
591
### [1.36.5](https://github.com/ajaxorg/ace/compare/v1.36.4...v1.36.5) (2024-11-14)
692

793

Makefile.dryice.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,13 @@ function ace() {
182182
function correctDeclarationsForBuild(path) {
183183
var definitions = fs.readFileSync(path, 'utf8');
184184
var newDefinitions = updateDeclarationModuleNames(definitions);
185+
if (additionalDeclarations) {
186+
newDefinitions = newDefinitions + '\n' + additionalDeclarations;
187+
}
188+
if (/ace\.d\.ts$/.test(path)) {
189+
var aceRequire = "$1\n export function require(name: string): any;";
190+
newDefinitions = newDefinitions.replace(/(declare\smodule\s"ace\-builds"\s{)/, aceRequire);
191+
}
185192
fs.writeFileSync(path, newDefinitions, "utf-8");
186193
}
187194

@@ -251,6 +258,7 @@ function demo() {
251258
);
252259
}
253260

261+
require("rimraf").sync(BUILD_DIR + "/demo/kitchen-sink/docs/");
254262
copy(ACE_HOME +"/demo/kitchen-sink/docs/", BUILD_DIR + "/demo/kitchen-sink/docs/");
255263

256264
copy.file(ACE_HOME + "/demo/kitchen-sink/logo.png", BUILD_DIR + "/demo/kitchen-sink/logo.png");
@@ -295,7 +303,7 @@ function demo() {
295303
source = source.replace(/( |^)require\(/gm, "$1ace.require(");
296304
}
297305
source = source.replace(/"\.\.\/build\//g, function(e) {
298-
console.log(e); return '"../';
306+
return '"../';
299307
});
300308
return source;
301309
}
@@ -651,7 +659,6 @@ function extractCss(callback) {
651659
else
652660
imageName = name + "-" + imageCounter + ".png";
653661
images[imageName] = buffer;
654-
console.log("url(\"" + directory + "/" + imageName + "\")");
655662
return "url(\"" + directory + "/" + imageName + "\")";
656663
}
657664
);

ace-modes.d.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,14 @@ declare module "ace-code/src/mode/css" {
303303
export const Mode: new () => import("ace-code").Ace.SyntaxMode;
304304
}
305305

306+
declare module "ace-code/src/mode/csv_highlight_rules" {
307+
export const CsvHighlightRules: new () => import("ace-code").Ace.HighlightRules;
308+
}
309+
310+
declare module "ace-code/src/mode/csv" {
311+
export const Mode: new () => import("ace-code").Ace.SyntaxMode;
312+
}
313+
306314
declare module "ace-code/src/mode/curly_highlight_rules" {
307315
export const CurlyHighlightRules: new () => import("ace-code").Ace.HighlightRules;
308316
}
@@ -1579,6 +1587,14 @@ declare module "ace-code/src/mode/toml" {
15791587
export const Mode: new () => import("ace-code").Ace.SyntaxMode;
15801588
}
15811589

1590+
declare module "ace-code/src/mode/tsv_highlight_rules" {
1591+
export const TsvHighlightRules: new () => import("ace-code").Ace.HighlightRules;
1592+
}
1593+
1594+
declare module "ace-code/src/mode/tsv" {
1595+
export const Mode: new () => import("ace-code").Ace.SyntaxMode;
1596+
}
1597+
15821598
declare module "ace-code/src/mode/tsx_highlight_rules" {
15831599
export const TsxHighlightRules: new () => import("ace-code").Ace.HighlightRules;
15841600
}

build

Submodule build updated 252 files

demo/emmet.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<pre id="editor"></pre>
2424

2525
<!-- load emmet code and snippets compiled for browser -->
26-
<script src="https://cloud9ide.github.io/emmet-core/emmet.js"></script>
26+
<!-- <script src="..."></script> -->
2727

2828
<script src="kitchen-sink/require.js"></script>
2929
<script>

demo/kitchen-sink/demo.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ doclist.pickDocument = function(name) {
361361

362362

363363
var OptionPanel = require("ace/ext/options").OptionPanel;
364-
var optionsPanel = new OptionPanel(env.editor);
364+
var optionsPanel = env.optionsPanel = new OptionPanel(env.editor);
365365

366366
var originalAutocompleteCommand = null;
367367

@@ -457,7 +457,6 @@ optionsPanel.add({
457457
var optionsPanelContainer = document.getElementById("optionsPanel");
458458
optionsPanel.render();
459459
optionsPanelContainer.insertBefore(optionsPanel.container, optionsPanelContainer.firstChild);
460-
optionsPanel.container.style.width = "80%";
461460
optionsPanel.on("setOption", function(e) {
462461
util.saveOption(e.name, e.value);
463462
});
@@ -467,6 +466,15 @@ function updateUIEditorOptions() {
467466
optionsPanel.render();
468467
}
469468

469+
env.editor.on("changeSession", function() {
470+
for (var i in env.editor.session.$options) {
471+
var value = util.getOption(i);
472+
if (value != undefined) {
473+
env.editor.setOption(i, value);
474+
}
475+
}
476+
});
477+
470478
optionsPanel.setOption("doc", util.getOption("doc") || "JavaScript");
471479
for (var i in optionsPanel.options) {
472480
var value = util.getOption(i);
@@ -490,13 +498,6 @@ function synchroniseScrolling() {
490498
var StatusBar = require("ace/ext/statusbar").StatusBar;
491499
new StatusBar(env.editor, cmdLine.container);
492500

493-
494-
var Emmet = require("ace/ext/emmet");
495-
net.loadScript("https://cloud9ide.github.io/emmet-core/emmet.js", function() {
496-
Emmet.setCore(window.emmet);
497-
env.editor.setOption("enableEmmet", true);
498-
});
499-
500501
require("ace/placeholder").PlaceHolder;
501502

502503
var snippetManager = require("ace/snippets").snippetManager;

0 commit comments

Comments
 (0)