diff --git a/tools/clog-builder-ace.lisp b/tools/clog-builder-ace.lisp index 80e183e..9c02e2a 100644 --- a/tools/clog-builder-ace.lisp +++ b/tools/clog-builder-ace.lisp @@ -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({ diff --git a/tools/clog-builder.lisp b/tools/clog-builder.lisp index abdabc5..eb66958 100644 --- a/tools/clog-builder.lisp +++ b/tools/clog-builder.lisp @@ -562,14 +562,15 @@ clog-builder window.") (setf search (create-gui-menu-drop-down menu :content "                            +               👁" :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) ""))))