open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

search/replace in extra CodeMirror boxes e.g. lint config

Browse Source
This commit is contained in:
tophf 2018-01-01 10:34:16 +03:00
parent b2100ea853
commit 27fe9fa9db
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
edit/edit.js
View File

@ -533,6 +533,7 @@ function showHelp(title = '', body) {
!$('.CodeMirror-hints, #message-box') && !$('.CodeMirror-hints, #message-box') &&
( (
!document.activeElement || !document.activeElement ||
!document.activeElement.closest('#search-replace-dialog') &&
document.activeElement.matches(':not(input), .can-close-on-esc') document.activeElement.matches(':not(input), .can-close-on-esc')
) )
); );

21
edit/global-search.js
View File

@ -204,6 +204,8 @@ onDOMready().then(() => {
cmFocused && document.activeElement || cmFocused && document.activeElement ||
state.activeAppliesTo || state.activeAppliesTo ||
state.cm); state.cm);
const cmExtra = $('body > :not(#sections) .CodeMirror');
state.editors = cmExtra ? [cmExtra.CodeMirror] : editors;
} }
@ -224,8 +226,8 @@ onDOMready().then(() => {
const {index, found, foundInCode} = state.find && doSearchInEditors({cmStart, canAdvance, inApplies}) || {}; const {index, found, foundInCode} = state.find && doSearchInEditors({cmStart, canAdvance, inApplies}) || {};
if (!foundInCode) clearMarker(); if (!foundInCode) clearMarker();
if (!found) makeTargetVisible(null); if (!found) makeTargetVisible(null);
const radiateFrom = foundInCode ? index : editors.indexOf(cmStart); const radiateFrom = foundInCode ? index : state.editors.indexOf(cmStart);
setupOverlay(radiateArray(editors, radiateFrom)); setupOverlay(radiateArray(state.editors, radiateFrom));
enableReplaceButtons(foundInCode); enableReplaceButtons(foundInCode);
if (state.find) { if (state.find) {
const firstSuccessfulSearch = foundInCode && !state.numFound; const firstSuccessfulSearch = foundInCode && !state.numFound;
@ -242,8 +244,8 @@ onDOMready().then(() => {
const BOF = {line: 0, ch: 0}; const BOF = {line: 0, ch: 0};
const EOF = getEOF(cmStart); const EOF = getEOF(cmStart);
const start = editors.indexOf(cmStart); const start = state.editors.indexOf(cmStart);
const total = editors.length; const total = state.editors.length;
let i = 0; let i = 0;
let wrapAround = 0; let wrapAround = 0;
let pos, index, cm; let pos, index, cm;
@ -262,7 +264,7 @@ onDOMready().then(() => {
for (; i < total + wrapAround; i++) { for (; i < total + wrapAround; i++) {
index = (start + i * (reverse ? -1 : 1) + total) % total; index = (start + i * (reverse ? -1 : 1) + total) % total;
cm = editors[index]; cm = state.editors[index];
if (i) { if (i) {
pos = !reverse ? BOF : {line: cm.doc.size, ch: 0}; pos = !reverse ? BOF : {line: cm.doc.size, ch: 0};
} }
@ -271,7 +273,7 @@ onDOMready().then(() => {
makeMatchVisible(cm, cursor); makeMatchVisible(cm, cursor);
return {found: true, foundInCode: true, index}; return {found: true, foundInCode: true, index};
} }
const cmForNextApplies = !reverse ? cm : editors[index ? index - 1 : total - 1]; const cmForNextApplies = !reverse ? cm : state.editors[index ? index - 1 : total - 1];
if (inApplies && doSearchInApplies(cmForNextApplies)) { if (inApplies && doSearchInApplies(cmForNextApplies)) {
return {found: true}; return {found: true};
} }
@ -345,8 +347,8 @@ onDOMready().then(() => {
function doReplaceAll() { function doReplaceAll() {
initState({initReplace: true}); initState({initReplace: true});
clearMarker(); clearMarker();
const generations = new Map(editors.map(cm => [cm, cm.changeGeneration()])); const generations = new Map(state.editors.map(cm => [cm, cm.changeGeneration()]));
const found = editors.filter(cm => doReplaceInEditor({cm, all: true})); const found = state.editors.filter(cm => doReplaceInEditor({cm, all: true}));
if (found.length) { if (found.length) {
state.lastFind = null; state.lastFind = null;
state.undoHistory.push(found.map(cm => [cm, generations.get(cm)])); state.undoHistory.push(found.map(cm => [cm, generations.get(cm)]));
@ -719,6 +721,7 @@ onDOMready().then(() => {
function getNextEditor(cm, step = 1) { function getNextEditor(cm, step = 1) {
const editors = state.editors;
return editors[(editors.indexOf(cm) + step + editors.length) % editors.length]; return editors[(editors.indexOf(cm) + step + editors.length) % editors.length];
} }
@ -790,7 +793,7 @@ onDOMready().then(() => {
function showTally(num, numApplies) { function showTally(num, numApplies) {
if (num === undefined) { if (num === undefined) {
num = 0; num = 0;
for (const cm of editors) { for (const cm of state.editors) {
const {annotate, overlay} = getStateSafe(cm); const {annotate, overlay} = getStateSafe(cm);
num += num +=
((annotate || {}).matches || []).length || ((annotate || {}).matches || []).length ||