diff --git a/CHANGELOG.md b/CHANGELOG.md index 0af6bd303..d071f23e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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.32.4](https://github.com/ajaxorg/ace/compare/v1.32.3...v1.32.4) (2024-01-29) + + +### Bug Fixes + +* Improve contrast of completion popup in CloudEditor theme ([#5473](https://github.com/ajaxorg/ace/issues/5473)) ([273c7f1](https://github.com/ajaxorg/ace/commit/273c7f159ded7dc9403266c6501e16a35e4101c6)) +* update JSX mode to reflect React JSX ([#5451](https://github.com/ajaxorg/ace/issues/5451)) ([66789a7](https://github.com/ajaxorg/ace/commit/66789a79ce1b7791c65886d8aecddd7efc0415e8)) + ### [1.32.3](https://github.com/ajaxorg/ace/compare/v1.32.2...v1.32.3) (2023-12-29) diff --git a/ace-modules.d.ts b/ace-modules.d.ts index ab51d37c5..2b2d0a83a 100644 --- a/ace-modules.d.ts +++ b/ace-modules.d.ts @@ -218,6 +218,7 @@ declare module 'ace-builds/src-noconflict/mode-xml'; declare module 'ace-builds/src-noconflict/mode-xquery'; declare module 'ace-builds/src-noconflict/mode-yaml'; declare module 'ace-builds/src-noconflict/mode-zeek'; +declare module 'ace-builds/src-noconflict/mode-zig'; declare module 'ace-builds/src-noconflict/theme-ambiance'; declare module 'ace-builds/src-noconflict/theme-chaos'; declare module 'ace-builds/src-noconflict/theme-chrome'; @@ -453,3 +454,4 @@ declare module 'ace-builds/src-noconflict/snippets/xml'; declare module 'ace-builds/src-noconflict/snippets/xquery'; declare module 'ace-builds/src-noconflict/snippets/yaml'; declare module 'ace-builds/src-noconflict/snippets/zeek'; +declare module 'ace-builds/src-noconflict/snippets/zig'; diff --git a/ace.d.ts b/ace.d.ts index 2a729c553..9b16d45c8 100644 --- a/ace.d.ts +++ b/ace.d.ts @@ -192,7 +192,7 @@ export namespace Ace { fontFamily: string; maxLines: number; minLines: number; - scrollPastEnd: boolean; + scrollPastEnd: number; fixedWidthGutter: boolean; customScrollbar: boolean; theme: string; diff --git a/css/theme/cloud_editor.css b/css/theme/cloud_editor.css index 18989898f..499364fda 100644 --- a/css/theme/cloud_editor.css +++ b/css/theme/cloud_editor.css @@ -182,3 +182,25 @@ outline: 1px solid #0073bb; } +.ace-cloud_editor.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line { + background-color: #f2f3f3; + border: #0F68AE 1.5px solid; +} +.ace-cloud_editor.ace_editor.ace_autocomplete .ace_line-hover { + border: 1px solid #16191f; + background: #f2f3f3; +} +.ace-cloud_editor.ace_editor.ace_autocomplete .ace_completion-meta { + color: #545b64; +} +.ace-cloud_editor.ace_editor.ace_autocomplete .ace_completion-highlight{ + color: #0F68AE; +} +.ace-cloud_editor.ace_editor.ace_autocomplete { + box-shadow: 0 1px 1px 0 #001c244d, 1px 1px 1px 0 #001c2426, -1px 1px 1px 0 #001c2426; + line-height: 1.5; + border: 1px solid #eaeded; + background: #ffffff; + color: #16191f; +} + diff --git a/css/theme/cloud_editor_dark.css b/css/theme/cloud_editor_dark.css index 1d3d3ea87..9fb3ff45d 100644 --- a/css/theme/cloud_editor_dark.css +++ b/css/theme/cloud_editor_dark.css @@ -185,3 +185,25 @@ outline: 1px solid #44b9d6; } +.ace-cloud_editor_dark.ace_dark.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line { + background-color: #272A30; + border: #299FBC 1.5px solid; +} +.ace-cloud_editor_dark.ace_dark.ace_editor.ace_autocomplete .ace_line-hover { + border: 1px solid #d5dbdb; + background: #272A30; +} +.ace-cloud_editor_dark.ace_dark.ace_editor.ace_autocomplete .ace_completion-meta { + color: #ACB8B9; +} +.ace-cloud_editor_dark.ace_dark.ace_editor.ace_autocomplete .ace_completion-highlight{ + color: #2AA0BC; +} +.ace-cloud_editor_dark.ace_dark.ace_editor.ace_autocomplete { + box-shadow: 0 1px 1px 0 #001c244d, 1px 1px 1px 0 #001c2426, -1px 1px 1px 0 #001c2426; + line-height: 1.5; + border: 1px solid #2a2e33; + background: #050506; + color: #ffffff; +} + diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js index e79c53ceb..59948ad4c 100644 --- a/demo/kitchen-sink/demo.js +++ b/demo/kitchen-sink/demo.js @@ -1650,7 +1650,7 @@ var supportedModes = { Jack: ["jack"], Jade: ["jade|pug"], Java: ["java"], - JavaScript: ["js|jsm|jsx|cjs|mjs"], + JavaScript: ["js|jsm|cjs|mjs"], JEXL: ["jexl"], JSON: ["json"], JSON5: ["json5"], @@ -1762,7 +1762,8 @@ var supportedModes = { XML: ["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl|xaml"], XQuery: ["xq"], YAML: ["yaml|yml"], - Zeek: ["zeek|bro"] + Zeek: ["zeek|bro"], + Zig: ["zig"] }; var nameOverrides = { ObjectiveC: "Objective-C", @@ -6078,6 +6079,7 @@ var Autocomplete = /** @class */ (function () { this.base = this.editor.session.doc.createAnchor(pos.row, pos.column); this.base.$insertRight = true; this.completions = new FilteredList(options.matches); + this.getCompletionProvider().completions = this.completions; return this.openPopup(this.editor, "", keepPopupPosition); } var session = this.editor.getSession(); diff --git a/demo/kitchen-sink/docs/jsx.jsx b/demo/kitchen-sink/docs/jsx.jsx index fbbeb6626..c74ead6cd 100644 --- a/demo/kitchen-sink/docs/jsx.jsx +++ b/demo/kitchen-sink/docs/jsx.jsx @@ -1,9 +1,9 @@ -/*EXPECTED -hello world! -*/ -class Test { - static function run() : void { - // console.log("hello world!"); - log "hello world!"; - } +import * as React from "react"; + +export default () => { + return ( +