package 18.07.24

ajaxorg · Jul 18, 2024 · de6d45a · de6d45a
1 parent 32003b7
commit de6d45a
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 17 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.35.3](https://github.com/ajaxorg/ace/compare/v1.35.2...v1.35.3) (2024-07-18)
+
+
+### Bug Fixes
+
+* ghost text rendering of empty lines ([#5615](https://github.com/ajaxorg/ace/issues/5615)) ([1ae0bdc](https://github.com/ajaxorg/ace/commit/1ae0bdcfb9da4078713d116e93a9c9a935a1258d))
+
 ### [1.35.2](https://github.com/ajaxorg/ace/compare/v1.35.1...v1.35.2) (2024-07-01)
 
 ### [1.35.1](https://github.com/ajaxorg/ace/compare/v1.35.0...v1.35.1) (2024-06-27)

diff --git a/css/ace.css b/css/ace.css
@@ -589,12 +589,14 @@ opacity:1;
 background-color: #ddd;
 }
 .ace_placeholder {
+position: relative;
 font-family: arial;
 transform: scale(0.9);
 transform-origin: left;
 white-space: pre;
 opacity: 0.7;
 margin: 0 10px;
+z-index: 1;
 }
 .ace_ghost_text {
 opacity: 0.5;

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.35.2",
+    "version": "1.35.3",
     "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/keybinding-emacs.js b/src-min-noconflict/keybinding-emacs.js
diff --git a/src-min/ace.js b/src-min/ace.js
diff --git a/src-min/keybinding-emacs.js b/src-min/keybinding-emacs.js
diff --git a/src-noconflict/ace.js b/src-noconflict/ace.js
diff --git a/src-noconflict/keybinding-emacs.js b/src-noconflict/keybinding-emacs.js
@@ -589,11 +589,11 @@ exports.handler.attach = function (editor) {
     editor.pushEmacsMark = function (p, activate) {
         var prevMark = this.session.$emacsMark;
         if (prevMark)
-            this.session.$emacsMarkRing.push(prevMark);
+            pushUnique(this.session.$emacsMarkRing, prevMark);
         if (!p || activate)
             this.setEmacsMark(p);
         else
-            this.session.$emacsMarkRing.push(p);
+            pushUnique(this.session.$emacsMarkRing, p);
     };
     editor.popEmacsMark = function () {
         var mark = this.emacsMark();
@@ -625,6 +625,13 @@ exports.handler.attach = function (editor) {
     editor.on('copy', this.onCopy);
     editor.on('paste', this.onPaste);
 };
+function pushUnique(ring, mark) {
+    var last = ring[ring.length - 1];
+    if (last && last.row === mark.row && last.column === mark.column) {
+        return;
+    }
+    ring.push(mark);
+}
 exports.handler.detach = function (editor) {
     editor.renderer.$blockCursor = false;
     editor.session.$selectLongWords = $formerLongWords;

diff --git a/src/ace.js b/src/ace.js
diff --git a/src/keybinding-emacs.js b/src/keybinding-emacs.js
@@ -589,11 +589,11 @@ exports.handler.attach = function (editor) {
     editor.pushEmacsMark = function (p, activate) {
         var prevMark = this.session.$emacsMark;
         if (prevMark)
-            this.session.$emacsMarkRing.push(prevMark);
+            pushUnique(this.session.$emacsMarkRing, prevMark);
         if (!p || activate)
             this.setEmacsMark(p);
         else
-            this.session.$emacsMarkRing.push(p);
+            pushUnique(this.session.$emacsMarkRing, p);
     };
     editor.popEmacsMark = function () {
         var mark = this.emacsMark();
@@ -625,6 +625,13 @@ exports.handler.attach = function (editor) {
     editor.on('copy', this.onCopy);
     editor.on('paste', this.onPaste);
 };
+function pushUnique(ring, mark) {
+    var last = ring[ring.length - 1];
+    if (last && last.row === mark.row && last.column === mark.column) {
+        return;
+    }
+    ring.push(mark);
+}
 exports.handler.detach = function (editor) {
     editor.renderer.$blockCursor = false;
     editor.session.$selectLongWords = $formerLongWords;