mirrors/clog
1
Fork 0
mirror of https://github.com/rabbibotton/clog.git synced 2025-12-15 15:00:24 -08:00
Code Issues Projects Releases Wiki Activity

rename js function causing regression

Browse source
This commit is contained in:
David Botton 2024-07-07 13:33:21 -04:00
parent ed790a7e98
commit 23af6f8d18
2 changed files with 37 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

66
tools/clog-builder-ace.lisp
View file

@ -71,39 +71,6 @@
(declare (ignore obj))
(when (current-editor-is-lisp app)
(on-new-sys-browser editor :search data))))
;; find symbol in file search
(js-execute editor
(format nil
"~A.commands.addCommand({
name: 'find-definition',
bindKey: {win: 'Alt-,', mac: 'Command-,'},
exec: function(editor) {
var row = editor.selection.getCursor().row;
var column = editor.selection.getCursor().column;
var c;
while (column > 0) {
c=editor.session.getTextRange(new ace.Range(row, column-1, row, column));
if (c=='(' || c==' ') { break; }
column--;
}
var s=column;
while (column < 200) {
c=editor.session.getTextRange(new ace.Range(row, column, row, column+1));
if (c==')' || c==' ') { break; }
column++;
}
c = editor.session.getTextRange(new ace.Range(row, s, row, column));
~A.trigger('clog-search', c);
},
readOnly: true,
});"
(clog-ace::js-ace editor)
(jquery editor)))
(set-on-event-with-data editor "clog-search"
(lambda (obj data)
(declare (ignore obj))
(when (current-editor-is-lisp app)
(on-file-search editor :search data))))
;; setup save key
(js-execute editor
(format nil
@ -185,6 +152,39 @@
(js-execute editor (format nil "~A.insert('~A',true)"
(clog-ace::js-ace editor)
(escape-string r))))))))
;; find symbol in file search
(js-execute editor
(format nil
"~A.commands.addCommand({
name: 'search-definition',
bindKey: {win: 'Alt-,', mac: 'Command-,'},
exec: function(editor) {
var row = editor.selection.getCursor().row;
var column = editor.selection.getCursor().column;
var c;
while (column > 0) {
c=editor.session.getTextRange(new ace.Range(row, column-1, row, column));
if (c=='(' || c==' ') { break; }
column--;
}
var s=column;
while (column < 200) {
c=editor.session.getTextRange(new ace.Range(row, column, row, column+1));
if (c==')' || c==' ') { break; }
column++;
}
c = editor.session.getTextRange(new ace.Range(row, s, row, column));
~A.trigger('clog-search', c);
},
readOnly: true,
});"
(clog-ace::js-ace editor)
(jquery editor)))
(set-on-event-with-data editor "clog-search"
(lambda (obj data)
(declare (ignore obj))
(when (current-editor-is-lisp app)
(on-file-search editor :search data))))
(js-execute editor
(format nil
"~A.commands.addCommand({

7
tools/clog-builder.lisp
View file

@ -562,14 +562,15 @@ clog-builder window.")
(setf search (create-gui-menu-drop-down menu :content
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&#x1F441;" :right-align t))
(setf sysbrw (create-form-element search :search :class *builder-menu-search-class*))
(setf (place-holder sysbrw) "system browse.. (alt-.)")
(setf sysbrw (create-form-element search :search :class *builder-menu-search-class* :size 35))
(setf (place-holder sysbrw) "system browse.. (alt-period)")
(set-on-change sysbrw (lambda (obj)
(on-new-sys-browser obj :search (text-value obj) :doc-maximize t)
(setf (text-value obj) "")))
(setf sysbrw (create-form-element search :search :class *builder-menu-search-class*))
(setf (place-holder sysbrw) "regex search.. (alt-,)")
(setf (place-holder sysbrw) "regex search.. (alt-comma)")
(set-on-change sysbrw (lambda (obj)
(on-file-search obj :search (text-value obj) :doc-maximize t)
(setf (text-value obj) ""))))