Merge branch 'master' into features-refactor

krassowski · krassowski · commit dfc65f7e77d2 · 2020-08-30T13:40:32.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ## CHANGELOG
 
+### `jupyter-lsp 0.9.2` (unreleased)
+
+- autodetects the `sql` language server for `.sql` files ([#328][])
+  - diagnostics are provided by `sqlint` which requires Node 11+
+    to work well (in contrast to currently required Node 10+).
+
+[#328]: https://github.com/krassowski/jupyterlab-lsp/pull/328
+
 ### `@krassowski/jupyterlab-lsp 2.0.0` (unreleased)
 
 - features
diff --git a/atest/01_Editor.robot b/atest/01_Editor.robot
@@ -60,6 +60,9 @@ TypeScript
     ${def} =    Set Variable    xpath:(//span[contains(@class, 'cm-variable')][contains(text(), 'inc')])[last()]
     Editor Shows Features for Language    TypeScript    example.ts    Diagnostics=The left-hand side of an arithmetic    Jump to Definition=${def}    Rename=${def}
 
+SQL
+    Editor Shows Features for Language    SQL    example.sql    Diagnostics=Expected
+
 YAML
     Editor Shows Features for Language    YAML    example.yaml    Diagnostics=duplicate key
 
diff --git a/atest/examples/example.sql b/atest/examples/example.sql
@@ -0,0 +1 @@
+SELECT * FR
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -32,4 +32,3 @@ variables:
 jobs:
   - template: ci/job.lint.yml
   - template: ci/job.test.yml
-  - template: ci/job.docs.yml
diff --git a/ci/job.docs.yml b/ci/job.docs.yml
diff --git a/ci/job.lint.yml b/ci/job.lint.yml
@@ -5,11 +5,11 @@ parameters:
       activate: source activate
   pythons:
     - name: ThreeSeven
-      spec: '>=3.7,<3.8.0a0'
+      spec: '>=3.8,<3.9.0a0'
       lab: '>=2,<3.0.0a0'
       nodejs: '>=12,<13.0.0a0'
-  env_update: conda env update -n jupyterlab-lsp --file env-test.yml --quiet
-  env_lint: conda env update -n jupyterlab-lsp --file requirements/lint.yml --quiet
+  env_update: mamba env update -n jupyterlab-lsp --file env-test.yml --quiet
+  env_lint: mamba env update -n jupyterlab-lsp --file requirements/lint.yml --quiet
 
 jobs:
   - ${{ each platform in parameters.platforms }}:
@@ -18,7 +18,7 @@ jobs:
             pool:
               vmImage: ${{ platform.vmImage }}
             steps:
-              - template: steps.conda.yml
+              - template: steps.mamba.yml
                 parameters:
                   name: ${{ platform.name }}
 
diff --git a/ci/job.test.yml b/ci/job.test.yml
@@ -25,7 +25,7 @@ parameters:
   js_cov_packages:
     - jupyterlab-go-to-definition
     - jupyterlab-lsp
-  env_update: conda env update -n base --file env-test.yml --quiet
+  env_update: mamba env update -n base --file env-test.yml --quiet
   lab_link: jupyter labextension link --debug --no-build $(LINKED_EXTENSIONS)
   lab_ext: jupyter labextension install --debug --no-build $(FIRST_PARTY_LABEXTENSIONS)
   lab_build: jupyter lab build --debug --dev-build=False --minimize=True
@@ -37,7 +37,7 @@ jobs:
             pool:
               vmImage: ${{ platform.vmImage }}
             steps:
-              - template: steps.conda.yml
+              - template: steps.mamba.yml
                 parameters:
                   name: ${{ platform.name }}
                   packages: "'python${{ python.spec }}'"
@@ -49,7 +49,7 @@ jobs:
                 displayName: update conda environment with test dependencies
 
               - script: conda info && conda list -n base
-                displayName: list conda packages and info
+                displayName: list conda info and packages
 
               - script: ${{ platform.activate }} && jlpm || jlpm || jlpm
                 displayName: install npm dependencies
diff --git a/ci/steps.mamba.yml b/ci/steps.mamba.yml
@@ -1,7 +1,6 @@
 parameters:
   name: Linux
-  packages: ''
-  install_cmd: conda install -yn base conda
+  install_cmd: conda install -yn base -c conda-forge --freeze-installed mamba conda=4.8.3
 
 steps:
   - ${{ if eq(parameters.name, 'Linux') }}:
@@ -19,5 +18,5 @@ steps:
       - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
         displayName: conda %PATH%
 
-  - script: ${{ parameters.install_cmd }} ${{ parameters.packages}} || ${{ parameters.install_cmd }} ${{ parameters.packages}} || ${{ parameters.install_cmd }} ${{ parameters.packages}}
-    displayName: update conda
+  - script: ${{ parameters.install_cmd }} || ${{ parameters.install_cmd }} || ${{ parameters.install_cmd }}
+    displayName: install mamba
diff --git a/docs/rtd.yml b/docs/rtd.yml
@@ -1,8 +1,11 @@
 # minimal possible conda env for modern nodejs
 name: jupyterlab-lsp-docs
 
+channels:
+  - conda-forge
+
 dependencies:
-  - nodejs
+  - nodejs >=11,<14
   - pip
   - python >=3.8,<3.9.0a0
   - pip:
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "lerna": "^3.13.2",
     "precise-commits": "^1.0.2",
     "prettier": "^2.0.5",
+    "sql-language-server": "^0.11.4",
     "typescript": "~3.9.5",
     "unified-language-server": "^0.3.0",
     "vscode-css-languageserver-bin": "^1.4.0",
diff --git a/py_src/jupyter_lsp/specs/__init__.py b/py_src/jupyter_lsp/specs/__init__.py
@@ -1,11 +1,13 @@
 """ default specs
 """
 # flake8: noqa: F401
+
 from .bash_language_server import BashLanguageServer
 from .dockerfile_language_server_nodejs import DockerfileLanguageServerNodeJS
 from .javascript_typescript_langserver import JavascriptTypescriptLanguageServer
 from .pyls import PythonLanguageServer
 from .r_languageserver import RLanguageServer
+from .sql_language_server import SQLLanguageServer
 from .texlab import Texlab
 from .unified_language_server import UnifiedLanguageServer
 from .vscode_css_languageserver import VSCodeCSSLanguageServer
@@ -23,4 +25,5 @@
 r = RLanguageServer()
 tex = Texlab()
 ts = JavascriptTypescriptLanguageServer()
+sql = SQLLanguageServer()
 yaml = YAMLLanguageServer()
diff --git a/py_src/jupyter_lsp/specs/config/sql-language-server.schema.json b/py_src/jupyter_lsp/specs/config/sql-language-server.schema.json
@@ -0,0 +1,60 @@
+{
+  "properties": {
+    "personalConfig": {
+      "connections": {
+        "type": "array",
+        "default": [
+          {
+            "name": "default sqlite3 connection",
+            "adapter": "sqlite3",
+            "filename": ":memory:",
+            "projectPaths": ["."]
+          }
+        ],
+        "items": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "description": "Connection name (free-form text)",
+              "type": "string"
+            },
+            "adapter": {
+              "description": "Database type",
+              "type": "string",
+              "enum": ["mysql", "postgresql", "postgres", "sqlite3"]
+            },
+            "host": {
+              "description": "Database host",
+              "type": "string"
+            },
+            "port": {
+              "description": "Database port",
+              "type": "number"
+            },
+            "user": {
+              "description": "Database user",
+              "type": "string"
+            },
+            "database": {
+              "description": "Database name",
+              "type": "string"
+            },
+            "password": {
+              "description": "Database password",
+              "type": "string"
+            },
+            "filename": {
+              "description": "Database filename - only for sqlite3 (required); use ':memory:' for in-memory database",
+              "type": "string"
+            },
+            "projectPaths": {
+              "description": "Project path that you want to apply (if you don't set it configuration will not apply automatically when lsp's started up)",
+              "type": "array",
+              "items": { "type": "string" }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/py_src/jupyter_lsp/specs/sql_language_server.py b/py_src/jupyter_lsp/specs/sql_language_server.py
@@ -0,0 +1,34 @@
+from .config import load_config_schema
+from .utils import NodeModuleSpec
+
+
+class SQLLanguageServer(NodeModuleSpec):
+    """Supports mysql, postgres and sqlite3"""
+
+    node_module = key = "sql-language-server"
+    script = ["dist", "bin", "cli.js"]
+    languages = [
+        "sql",
+    ]
+    args = ["up", "--method", "stdio"]
+    spec = dict(
+        display_name=key,
+        mime_types=[
+            "application/sql",
+            "text/sql",
+            "text/x-sql",
+            "text/x-mysql",
+            "text/x-mariadb",
+            "text/x-pgsql",
+        ],
+        urls=dict(
+            home="https://github.com/joe-re/{}".format(key),
+            issues="https://github.com/joe-re/{}/issues".format(key),
+        ),
+        install=dict(
+            npm="npm install --save-dev {}".format(key),
+            yarn="yarn add --dev {}".format(key),
+            jlpm="jlpm add --dev {}".format(key),
+        ),
+        config_schema=load_config_schema(key),
+    )
diff --git a/py_src/jupyter_lsp/tests/conftest.py b/py_src/jupyter_lsp/tests/conftest.py
@@ -3,13 +3,12 @@
 import shutil
 from typing import Text
 
-from notebook.notebookapp import NotebookApp
-from pytest import fixture
-from tornado.queues import Queue
-
 # local imports
 from jupyter_lsp import LanguageServerManager
 from jupyter_lsp.handlers import LanguageServersHandler, LanguageServerWebSocketHandler
+from notebook.notebookapp import NotebookApp
+from pytest import fixture
+from tornado.queues import Queue
 
 # these should always be available in a test environment ()
 KNOWN_SERVERS = [
@@ -18,6 +17,7 @@
     "javascript-typescript-langserver",
     "pyls",
     "unified-language-server",
+    "sql-language-server",
     "vscode-css-languageserver-bin",
     "vscode-html-languageserver-bin",
     "vscode-json-languageserver-bin",
diff --git a/setup.cfg b/setup.cfg
@@ -43,6 +43,7 @@ jupyter_lsp_spec_v1 =
     python-language-server = jupyter_lsp.specs:py
     r-languageserver = jupyter_lsp.specs:r
     texlab = jupyter_lsp.specs:tex
+    sql-language-server = jupyter_lsp.specs:sql
     unified-language-server = jupyter_lsp.specs:md
     vscode-css-languageserver-bin = jupyter_lsp.specs:css
     vscode-html-languageserver-bin = jupyter_lsp.specs:html
diff --git a/yarn.lock b/yarn.lock
