Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Ported Cloud9 Find Replace Plugin to Ace Editor with Enhancements #5502

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

WIP: Ported Cloud9 Find Replace Plugin to Ace Editor with Enhancements #5502

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
484d5cb
port findreplace search logic
mkslanc Mar 6, 2024
a7c78e7
add test for regex lookaheads
mkslanc Mar 6, 2024
af51ee8
use single line editor as inputs
mkslanc Mar 7, 2024
e580234
add regexp highlight to search input; add search history
mkslanc Mar 12, 2024
9b484d3
Merge branch 'master' into search-porting
mkslanc Mar 12, 2024
c669f9b
refactor `updateCounter` method
mkslanc Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
refactor updateCounter method
  • Loading branch information
@mkslanc
mkslanc committed Mar 12, 2024
commit c669f9b56862ec64462541ead3898a396030ef80
45 changes: 23 additions & 22 deletions src/ext/searchbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,14 @@ class SearchBox {

options.start = this.currentRange;

/*if (options.range && !isHighlight)
/*TODO: if (options.range && !isHighlight)
addFindInRangeMarker(options.range, ace.session);
else if (!options.range)
removeFindInRangeMarker();*/

var re = this.editor.$search.$assembleRegExp(options, true);
if (!re) {
this.counterResults = null;
this.updateCounter();
if (!isHighlight) {
var pos = options.start[options.backwards ? "end" : "start"];
Expand All @@ -320,15 +321,22 @@ class SearchBox {
this.editor.$search.set({start: range});

asyncSearch.execFind(this.editor.session, options, (result) => {
if (result == "waiting") //TODO: seems passing any string to total doesn't do anything
return this.updateCounter("..."); //TODO: make without args
if (result == "waiting") {
this.counterResults = null;
return this.updateCounter();
}

result = result || {
total: 0,
current: 0
};
if ("total" in result) {
this.updateCounter(result.total, result.current, null, result.wrapped);
this.counterResults = {
total: result.total,
current: result.current,
wrapped: result.wrapped
};
this.updateCounter();
}
if (!result.start || !result.end) {
result.start = result.end = range[!options.backwards ? "start" : "end"];
Expand Down Expand Up @@ -357,32 +365,24 @@ class SearchBox {
});
}

/**
* @param {string | number} [total]
* @param {string | number} [current]
* @param {string} [msg]
* @param {boolean} [wrapped]
*/
updateCounter(total, current, msg, wrapped) {
msg = msg || "";
updateCounter() {
var msg = "";

var color = wrapped ? "blue" : "";
var color = this.counterResults && this.counterResults.wrapped ? "blue" : "";

if (typeof total == "number" && typeof current == "number") {
if (!total) {
current = 0;
if (this.counterResults && typeof this.counterResults.total == "number" && typeof this.counterResults.current
== "number") {
if (!this.counterResults.total) {
this.counterResults.current = 0;
color = "red";
}
else {
//current = getOptions().backwards ? total - current : current + 1; TODO:
current = current + 1;
this.counterResults.current = this.counterResults.current + 1;
}
msg = current + "/" + total + msg;
msg = this.counterResults.current + "/" + this.counterResults.total + msg;
}
this.searchCounter.style.color = color;

this.searchCounter.textContent = msg;
//nls("$0 of $1", [before , (all > MAX_COUNT ? MAX_COUNT + "+" : all)]);
}
findNext() {
this.find(true, false);
Expand Down Expand Up @@ -443,6 +443,7 @@ class SearchBox {
var options = this.getOptions();
var re = this.editor.$search.$assembleRegExp(options, true);
if (!re) {
this.counterResults = null;
return this.updateCounter();
}
options.re = re;
Expand Down Expand Up @@ -492,7 +493,7 @@ class SearchBox {
offset += replacement.length - txt.length;
}
}

this.counterResults = null;
this.updateCounter();
callback && callback();
}
Expand Down
Loading