Merge pull request #446 from krassowski/auto-clear-highlights

Allow to clear highlights on blur

Author: krassowski

CHANGELOG.md

@@ -1,6 +1,10 @@
 ## CHANGELOG
 
-### `@krassowski/jupyterlab-lsp 2.1.2` (2020-12-XX)
+### `@krassowski/jupyterlab-lsp 2.1.2` (2021-01-XX)
+
+- features
+
+  - highlights can now be auto-removed from the cells/editors on blur (set `removeOnBlur` to `true` in settings) ([#446])
 
 - bug fixes
   - improved performance of completion and highlights by minimising the number of highlight requests and GUI redraws (token checking, debouncing, acting on a single response only) ([#433])
@@ -9,6 +13,7 @@
 
 [#433]: https://github.com/krassowski/jupyterlab-lsp/issues/433
 [#434]: https://github.com/krassowski/jupyterlab-lsp/issues/434
+[#446]: https://github.com/krassowski/jupyterlab-lsp/issues/446
 
 ### `@krassowski/jupyterlab-lsp 2.1.1` (2020-12-15)
 

atest/05_Features/Completion.robot

@@ -215,7 +215,7 @@ Completer Should Suggest
 
 Completer Should Include Icon
     [Arguments]    ${icon}
-    Wait Until Page Contains Element    ${COMPLETER_BOX} svg[data-icon="${icon}"]
+    Wait Until Page Contains Element    ${COMPLETER_BOX} svg[data-icon="${icon}"]    timeout=10s
 
 Completer Should Not Suggest
     [Arguments]    ${text}

atest/05_Features/Highlights.robot

@@ -37,25 +37,43 @@ Highlights are changed when moving cursor between cells
     Press Keys    None    DOWN    # cursor to third cell, second line (`|test `)
     Should Highlight Token    test
 
-Highlights are added after typing
+Highlights are modified after typing
     Enter Cell Editor    1    line=2
+    Press Keys    None    END    # cursor after the token in second line (`test|`)
     Should Highlight Token    test
-    Press Keys    None    a
+    Press Keys    None    a    # cursor after the token in second line (`testa|`)
     Should Highlight Token    testa
 
+Highlights are removed when no cell is focused
+    Enter Cell Editor    1    line=2
+    # Remove when turned on
+    Configure JupyterLab Plugin    {"removeOnBlur": true}    plugin id=${HIGHLIGHTS PLUGIN ID}
+    Should Highlight Token    test
+    Blur Cell Editor    1
+    Should Not Highlight Any Tokens
+    # Do not remove when turned off
+    Configure JupyterLab Plugin    {"removeOnBlur": false}    plugin id=${HIGHLIGHTS PLUGIN ID}
+    Should Highlight Token    test
+    Blur Cell Editor    1
+    Should Highlight Token    test
+
 *** Keywords ***
 Should Not Highlight Any Tokens
     Page Should Not Contain    css:.cm-lsp-highlight
 
 Should Highlight Token
-    [Arguments]    ${token}    ${timeout}=10s
+    [Arguments]    ${token}    ${timeout}=15s
     ${token_element}    Set Variable    xpath://span[contains(@class, 'cm-lsp-highlight')][contains(text(), '${token}')]
     Wait Until Page Contains Element    ${token_element}    timeout=${timeout}
 
 Should Not Highlight Token
-    [Arguments]    ${token}    ${timeout}=10s
+    [Arguments]    ${token}    ${timeout}=15s
     ${token_element}    Set Variable    xpath://span[contains(@class, 'cm-lsp-highlight')][contains(text(), '${token}')]
     Wait Until Page Does Not Contain Element    ${token_element}    timeout=${timeout}
 
 Setup Highlights Test
     Setup Notebook    Python    Highlights.ipynb
+
+Blur Cell Editor
+    [Arguments]    ${cell_nr}
+    Click Element    css:.jp-Cell:nth-child(${cell_nr}) .jp-InputPrompt

atest/Keywords.robot

@@ -201,7 +201,7 @@ Open Context Menu for File
     Ensure File Browser is Open
     Click Element    ${JLAB CSS REFRESH FILES}
     ${selector} =    Set Variable    xpath://span[@class='jp-DirListing-itemText']\[text() = '${file}']
-    Wait Until Page Contains Element    ${selector}
+    Wait Until Page Contains Element    ${selector}    timeout=10s
     Open Context Menu    ${selector}
 
 Rename Jupyter File

atest/Variables.robot

@@ -45,6 +45,7 @@ ${CM CURSORS}     css:.jp-MainAreaWidget:not(.lm-mod-hidden) .CodeMirror-cursors
 # settings
 ${LSP PLUGIN ID}    @krassowski/jupyterlab-lsp:plugin
 ${COMPLETION PLUGIN ID}    @krassowski/jupyterlab-lsp:completion
+${HIGHLIGHTS PLUGIN ID}    @krassowski/jupyterlab-lsp:highlights
 ${JUMP PLUGIN ID}    @krassowski/jupyterlab-lsp:jump_to
 ${DIAGNOSTICS PLUGIN ID}    @krassowski/jupyterlab-lsp:diagnostics
 ${CSS USER SETTINGS}    .jp-SettingsRawEditor-user

packages/jupyterlab-lsp/schema/highlights.json

@@ -10,6 +10,12 @@
       "type": "number",
       "default": 250,
       "description": "Number of milliseconds to delay sending out the highlights request to the language server; you can get better responsiveness adjusting this value, but setting it to zero can actually slow it down as the server might get overwhelmed when moving the cursor."
+    },
+    "removeOnBlur": {
+      "title": "Remove highlights on editor (e.g. cell) blur",
+      "type": "boolean",
+      "default": false,
+      "description": "Whether the highlights should disappear after the focus leaves the editor/cell"
     }
   },
   "jupyter.lab.shortcuts": []

packages/jupyterlab-lsp/src/features/highlights.ts

@@ -65,11 +65,20 @@ export class HighlightsCM extends CodeMirrorIntegration {
       this.debounced_get_highlight = this.create_debouncer();
     });
     this.editor_handlers.set('cursorActivity', this.onCursorActivity);
-    this.editor_handlers.set('blur', this.onCursorActivity);
+    this.editor_handlers.set('blur', this.onBlur);
     this.editor_handlers.set('focus', this.onCursorActivity);
     super.register();
   }
 
+  protected onBlur = () => {
+    if (this.settings.composite.removeOnBlur) {
+      this.clear_markers();
+      this.last_token = null;
+    } else {
+      this.onCursorActivity().catch(console.warn);
+    }
+  };
+
   remove(): void {
     this.handleHighlight = null;
     this.onCursorActivity = null;