Merge branch 'master' into documentation

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.12.3](https://github.com/ajaxorg/ace/compare/v1.12.2...v1.12.3) (2022-10-18)
+
+
+### Bug Fixes
+
+* Fix syntax error in the custom scroll CSS ([#4968](https://github.com/ajaxorg/ace/issues/4968)) ([f2a424a](https://github.com/ajaxorg/ace/commit/f2a424a649f655b9511b1bb6047097634edb0e3f))
+
 ### [1.12.2](https://github.com/ajaxorg/ace/compare/v1.12.1...v1.12.2) (2022-10-18)
 
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "ace-code",
     "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
-    "version": "1.12.2",
+    "version": "1.12.3",
     "homepage": "http://github.com/ajaxorg/ace",
     "engines": {
         "node": ">= 0.6.0"

src/commands/default_commands.js

@@ -744,6 +744,10 @@ exports.commands = [{
     multiSelectAction: "forEach",
     scrollIntoView: "cursor",
     readOnly: true
+}, {
+    name: "openlink",
+    bindKey: bindKey("Ctrl+F3", "F3"),
+    exec: function(editor) { editor.openLink(); }
 }, {
     name: "joinlines",
     description: "Join lines",

src/config.js

@@ -141,6 +141,6 @@ var reportErrorIfPathIsNotConfigured = function() {
     }
 };
 
-exports.version = "1.12.2";
+exports.version = "1.12.3";
 
 

src/editor.js

@@ -1729,6 +1729,41 @@ Editor.$uid = 0;
         }
     };
 
+    /**
+     * Finds link at defined {row} and {column}
+     * @returns {String}
+     **/
+    this.findLinkAt = function (row, column) {
+        var line = this.session.getLine(row);
+        var wordParts = line.split(/((?:https?|ftp):\/\/[\S]+)/);
+        var columnPosition = column;
+        if (columnPosition < 0) columnPosition = 0;
+        var previousPosition = 0, currentPosition = 0, match;
+        for (let item of wordParts) {
+            currentPosition = previousPosition + item.length;
+            if (columnPosition >= previousPosition && columnPosition <= currentPosition) {
+                if (item.match(/((?:https?|ftp):\/\/[\S]+)/)) {
+                    match = item.replace(/[\s:.,'";}\]]+$/, "");
+                    break;
+                }
+            }
+            previousPosition = currentPosition;
+        }
+        return match;
+    };
+
+    /**
+     * Open valid url under cursor in another tab
+     * @returns {Boolean}
+     **/
+    this.openLink = function () {
+        var cursor =  this.selection.getCursor();
+        var url = this.findLinkAt(cursor.row, cursor.column);
+        if (url)
+            window.open(url, '_blank');
+        return url != null;
+    };
+
     /**
      * Removes all the lines in the current selection
      * @related EditSession.remove

src/editor_commands_test.js

@@ -5,8 +5,6 @@ if (typeof process !== "undefined") {
 
 "use strict";
 
-var ace = require("./ace");
-var EditSession = require("./edit_session").EditSession;
 var Editor = require("./editor").Editor;
 var UndoManager = require("./undomanager").UndoManager;
 var MockRenderer = require("./test/mockrenderer").MockRenderer;
@@ -533,6 +531,16 @@ module.exports = {
         exec("selectlineend", 1);
         editor.execCommand(editor.commands.byName.joinlines);
         assert.equal(editor.getValue(), "foo for foo foo foo for foo foo\nfoo for foo foo");
+    },
+    "test findlink": function() {
+        editor = new Editor(new MockRenderer());
+
+        editor.setValue("foo for foo foo\nhttps://www.google.com/", 1);
+        var url = editor.findLinkAt(0, 1);
+        assert.equal(url, null);
+
+        url = editor.findLinkAt(1, 5);
+        assert.equal(url, "https://www.google.com/");
     }
 };
 

src/scrollbar_custom.js

@@ -17,7 +17,8 @@ dom.importCssString(`.ace_editor>.ace_sb-v div, .ace_editor>.ace_sb-h div{
 .ace_editor>.ace_sb-v, .ace_editor>.ace_sb-h {
   position: absolute;
   z-index: 6;
-  background: none;' + '  overflow: hidden!important;
+  background: none;
+  overflow: hidden!important;
 }
 .ace_editor>.ace_sb-v {
   z-index: 6;