Prechádzať zdrojové kódy

Reinstate search for documents

Steven Silvester 7 rokov pred
rodič
commit
a0f54a9df2

+ 2 - 0
packages/codemirror/src/editor.ts

@@ -36,6 +36,8 @@ import 'codemirror/addon/edit/matchbrackets.js';
 import 'codemirror/addon/edit/closebrackets.js';
 import 'codemirror/addon/comment/comment.js';
 import 'codemirror/addon/scroll/scrollpastend.js';
+import 'codemirror/addon/search/searchcursor';
+import 'codemirror/addon/search/search';
 import 'codemirror/keymap/emacs.js';
 import 'codemirror/keymap/sublime.js';
 import 'codemirror/keymap/vim.js';

+ 2 - 0
packages/codemirror/src/factory.ts

@@ -51,6 +51,7 @@ class CodeMirrorEditorFactory implements IEditorFactoryService {
    * Create a new editor for inline code.
    */
   newInlineEditor(options: CodeEditor.IOptions): CodeEditor.IEditor {
+    options.host.dataset.type = 'inline';
     return new CodeMirrorEditor({
       ...options,
       config: { ...this.inlineCodeMirrorConfig, ...options.config || {} }
@@ -61,6 +62,7 @@ class CodeMirrorEditorFactory implements IEditorFactoryService {
    * Create a new editor for a full document.
    */
   newDocumentEditor(options: CodeEditor.IOptions): CodeEditor.IEditor {
+    options.host.dataset.type = 'document';
     return new CodeMirrorEditor({
       ...options,
       config: { ...this.documentCodeMirrorConfig, ...options.config || {} }

+ 6 - 0
packages/codemirror/style/index.css

@@ -58,6 +58,12 @@
 }
 
 
+/* Hide dialogs in inline editors due to poor UX with small editors. */
+.jp-CodeMirrorEditor[data-type="inline"] .CodeMirror-dialog {
+  display: none;
+}
+
+
 .CodeMirror-cursor {
   border-left: 1px solid var(--jp-editor-cursor-color);
 }