try a lightweight fix for uri comparison

Author: bollwyvl

atest/03_Notebook.robot

@@ -14,22 +14,15 @@ Python
 
 Foreign Extractors
     ${file} =    Set Variable    Foreign extractors.ipynb
-    # #288: this would need to be restored for latex
-    #
-    # Configure JupyterLab Plugin    {"language_servers": {"texlab": {"serverSettings": {"latex.lint.onChange": true}}}}
-    #
+    Configure JupyterLab Plugin    {"language_servers": {"texlab": {"serverSettings": {"latex.lint.onChange": true}}}}
     Setup Notebook    Python    ${file}
     # if mypy and pyflakes will fight over `(N|n)ame 'valid'`, just hope for the best
     @{diagnostics} =    Create List
     ...    Failed to parse expression    # bash
     ...    ame 'valid'    # python
     ...    Trailing whitespace is superfluous.    # r
     ...    `frob` is misspelt    # markdown
-    #
-    # #288: once configured, diagnostics are coming back over the wire, but not displaying
-    #
-    # ...    Command terminated with space    # latex
-    #
+    ...    Command terminated with space    # latex
     FOR    ${diagnostic}    IN    @{diagnostics}
         Wait Until Page Contains Element    css:.cm-lsp-diagnostic[title*\="${diagnostic}"]    timeout=35s
         Capture Page Screenshot    0x-${diagnostic}.png

packages/jupyterlab-lsp/src/adapters/codemirror/features/diagnostics.ts

@@ -4,7 +4,7 @@ import { Menu } from '@lumino/widgets';
 import { PositionConverter } from '../../../converter';
 import { IVirtualPosition, IEditorPosition } from '../../../positioning';
 import { diagnosticSeverityNames } from '../../../lsp';
-import { DefaultMap } from '../../../utils';
+import { DefaultMap, uris_equal } from '../../../utils';
 import { CodeMirrorLSPFeature, IFeatureCommand } from '../feature';
 import { MainAreaWidget } from '@jupyterlab/apputils';
 import {
@@ -217,7 +217,7 @@ export class Diagnostics extends CodeMirrorLSPFeature {
   }
 
   public handleDiagnostic = (response: lsProtocol.PublishDiagnosticsParams) => {
-    if (response.uri !== this.virtual_document.document_info.uri) {
+    if (!uris_equal(response.uri, this.virtual_document.document_info.uri)) {
       return;
     }
 

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

@@ -4,6 +4,7 @@ import { documentHighlightKindNames } from '../../../lsp';
 import { VirtualDocument } from '../../../virtual/document';
 import { IRootPosition } from '../../../positioning';
 import { CodeMirrorLSPFeature, IFeatureCommand } from '../feature';
+import { uris_equal } from '../../../utils';
 
 export class Highlights extends CodeMirrorLSPFeature {
   name = 'Highlights';
@@ -49,7 +50,7 @@ export class Highlights extends CodeMirrorLSPFeature {
     items: lsProtocol.DocumentHighlight[],
     documentUri: string
   ) => {
-    if (documentUri !== this.virtual_document.document_info.uri) {
+    if (!uris_equal(documentUri, this.virtual_document.document_info.uri)) {
       return;
     }
     this.clear_markers();

packages/jupyterlab-lsp/src/adapters/codemirror/features/hover.ts

@@ -1,4 +1,4 @@
-import { getModifierState } from '../../../utils';
+import { getModifierState, uris_equal } from '../../../utils';
 import {
   IRootPosition,
   is_equal,
@@ -96,7 +96,7 @@ export class Hover extends CodeMirrorLSPFeature {
   }
 
   public handleHover = (response: lsProtocol.Hover, documentUri: string) => {
-    if (documentUri !== this.virtual_document.document_info.uri) {
+    if (!uris_equal(documentUri, this.virtual_document.document_info.uri)) {
       return;
     }
     this.hide_hover();

packages/jupyterlab-lsp/src/utils.ts

@@ -97,15 +97,16 @@ export function server_root_uri() {
 /**
  * compare two URIs, discounting:
  * - drive capitalization
+ * - uri encoding
  * TODO: probably use vscode-uri
  */
 export function uris_equal(a: string, b: string) {
   const win_paths = is_win_path(a) && is_win_path(b);
   if (win_paths) {
-    return normalize_win_path(a) === normalize_win_path(b);
-  } else {
-    return a === b;
+    a = normalize_win_path(a);
+    b = normalize_win_path(b);
   }
+  return a === b || decodeURI(a) === decodeURI(b);
 }
 
 /**