Merge branch 'master' into tcp_mode2

Author: FlyingSamson

packages/jupyterlab-lsp/src/components/statusbar.tsx

@@ -340,17 +340,16 @@ class LSPPopup extends VDomRenderer<LSPStatus.Model> {
         );
       }
     );
+    const trans = this.model.trans;
     return (
       <div className={'lsp-popover-content'}>
         <div className={'lsp-servers-menu'}>
-          <h3 className={'lsp-servers-title'}>
-            {this.model.trans.__('LSP servers')}
-          </h3>
+          <h3 className={'lsp-servers-title'}>{trans.__('LSP servers')}</h3>
           <div className={'lsp-servers-lists'}>
             {servers_available.length ? (
               <CollapsibleList
                 key={'available'}
-                title={this.model.trans.__('Available')}
+                title={trans.__('Available')}
                 list={servers_available}
                 startCollapsed={true}
               />
@@ -360,7 +359,7 @@ class LSPPopup extends VDomRenderer<LSPStatus.Model> {
             {running_servers.length ? (
               <CollapsibleList
                 key={'running'}
-                title={this.model.trans.__('Running')}
+                title={trans.__('Running')}
                 list={running_servers}
               />
             ) : (
@@ -369,7 +368,7 @@ class LSPPopup extends VDomRenderer<LSPStatus.Model> {
             {missing_languages.length ? (
               <CollapsibleList
                 key={'missing'}
-                title={this.model.trans.__('Missing')}
+                title={trans.__('Missing')}
                 list={missing_languages}
               />
             ) : (
@@ -378,15 +377,15 @@ class LSPPopup extends VDomRenderer<LSPStatus.Model> {
           </div>
         </div>
         <div className={'lsp-popover-status'}>
-          {this.model.trans.__('Documentation:')}{' '}
+          {trans.__('Documentation:')}{' '}
           <a
             href={
               'https://jupyterlab-lsp.readthedocs.io/en/latest/Language%20Servers.html'
             }
             target="_blank"
             rel="noreferrer"
           >
-            {this.model.trans.__('Language Servers')}
+            {trans.__('Language Servers')}
           </a>
         </div>
       </div>
@@ -845,7 +844,7 @@ export namespace LSPStatus {
           uninitialized.delete(initialized);
         }
         // servers for n documents did not respond to the initialization request
-        msg = this.trans.__(
+        msg = this.trans._n(
           'Fully connected, but %2/%3 virtual document stuck uninitialized: %4',
           'Fully connected, but %2/%3 virtual documents stuck uninitialized: %4',
           status.detected_documents.size,
@@ -859,7 +858,7 @@ export namespace LSPStatus {
           unconnected.delete(connected);
         }
 
-        msg = this.trans.__(
+        msg = this.trans._n(
           '%2/%3 virtual document connected (%4 connections; waiting for: %5)',
           '%2/%3 virtual documents connected (%4 connections; waiting for: %5)',
           status.detected_documents.size,

python_packages/jupyter_lsp/jupyter_lsp/specs/texlab.py

@@ -1,6 +1,19 @@
 from .config import load_config_schema
 from .utils import ShellSpec
 
+TROUBLESHOOT = """\
+Please ensure that texlab executable is in the PATH; \
+this should happen automatically when installing texlab from Conda, \
+but may require manual configuration of PATH environment variable \
+if you compiled texlab from source.
+
+You can ensure check if texlab is in the PATH, by running:
+
+  which texlab
+
+which should return the path to the executable (if found).
+"""
+
 
 class Texlab(ShellSpec):
     cmd = key = "texlab"
@@ -15,4 +28,5 @@ class Texlab(ShellSpec):
         install=dict(conda="conda install -c conda-forge texlab chktex"),
         config_schema=load_config_schema(key),
         env=dict(RUST_BACKTRACE="1"),
+        troubleshoot=TROUBLESHOOT,
     )