Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade linters, language servers #381

Merged
merged 11 commits into from
Nov 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/job.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ jobs:
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }}, Python ${{ matrix.python }}, Node ${{ matrix.nodejs }}
strategy:
# TODO: maybe turn back on
fail-fast: false
matrix:
python: [3.6, 3.7, 3.8]
os: [ubuntu-16.04, macos-10.14, vs2017-win2016]
Expand Down Expand Up @@ -83,9 +85,6 @@ jobs:
auto-update-conda: true
use-only-tar-bz2: true # needs to be set for caching to work properly

- name: Install pip dependencies
run: pip install pytest-github-actions-annotate-failures

- name: Describe conda
shell: bash -l {0}
run: |
Expand All @@ -105,7 +104,7 @@ jobs:
yarn-

- name: Install npm dependencies
run: jlpm
run: jlpm --ignore-optional

- name: Build the extension
run: jlpm build
Expand Down Expand Up @@ -145,6 +144,7 @@ jobs:
run: python scripts/tectonic_cache.py

- name: Run frontend unit tests
if: ${{ !contains(matrix.os, 'win') }}
run: jlpm test

# js_cov_packages:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,6 @@ atest/output/
junit.xml
coverage/
.vscode/
_schema.d.ts
_*.d.ts
_build
.virtual_documents/
4 changes: 2 additions & 2 deletions atest/03_Notebook.robot
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Python
Foreign Extractors
${file} = Set Variable Foreign extractors.ipynb
Configure JupyterLab Plugin
... {"language_servers": {"texlab": {"serverSettings": {"latex.lint.onChange": true}}}}
... {"language_servers": {"texlab": {"serverSettings": {"latex.lint.onChange": true}}, "bash-langauge-server": {"bashIde.highlightParsingErrors": true}}}
Capture Page Screenshot 10-configured.png
Reset Application State
Setup Notebook Python ${file}
@{diagnostics} = Create List
... Failed to parse expression # bash
... Failed to parse expression # bash, configured by spec.env
... ame 'valid' # python, mypy and pyflakes will fight over `(N|n)ame 'valid'`, just hope for the best
... Trailing whitespace is superfluous. # r
... `frob` is misspelt # markdown
Expand Down
3 changes: 1 addition & 2 deletions atest/07_Configuration.robot
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ Python
... undefined name 'foo' (flake8)

YAML
[Documentation] EXPECT FAIL Composer YAML files don't allow a "greetings" key
[Tags] expect:fail
[Documentation] Composer YAML files don't allow a "greetings" key
Settings Should Change Editor Diagnostics YAML example.yaml yaml-language-server
... {"yaml.schemas": {"http://json.schemastore.org/composer": "*"}}
... duplicate key
Expand Down
2 changes: 1 addition & 1 deletion atest/examples/Code overrides.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion atest/examples/Completion.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.0"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion atest/examples/Diagnostic.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion atest/examples/Foreign extractors.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.6"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion atest/examples/Hover.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion atest/examples/Panel.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion atest/examples/Python.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.0"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion atest/examples/Signature.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.0"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion atest/examples/Syntax highlighting.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
4 changes: 2 additions & 2 deletions atest/ports.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@


def get_unused_port():
""" Get an unused port by trying to listen to any random port.
"""Get an unused port by trying to listen to any random port.

Probably could introduce race conditions if inside a tight loop.
Probably could introduce race conditions if inside a tight loop.
"""
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.bind(("localhost", 0))
Expand Down
2 changes: 1 addition & 1 deletion docs/Architecture.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion docs/CHANGELOG.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.6"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion docs/Configuring.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion docs/Contributing.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.6"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion docs/Extending.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion docs/Installation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.6"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
3 changes: 2 additions & 1 deletion docs/Language Servers.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"\n",
"import IPython\n",
"from jinja2 import Template\n",
"\n",
"from jupyter_lsp import LanguageServerManager"
]
},
Expand Down Expand Up @@ -278,7 +279,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.6"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
4 changes: 2 additions & 2 deletions docs/Releasing.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
"nbformat_minor": 4
}
}
2 changes: 1 addition & 1 deletion docs/Roadmap.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
3 changes: 1 addition & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@


def setup(app):
""" Runs before the "normal business" of sphinx. Don't go too crazy here.
"""
"""Runs before the "normal business" of sphinx. Don't go too crazy here."""
app.add_css_file("css/custom.css")
subprocess.check_call(["jlpm", "--ignore-optional"])
2 changes: 1 addition & 1 deletion docs/index.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.7.9"
}
},
"nbformat": 4,
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"dependencies": {},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^2.27.0",
"@typescript-eslint/parser": "^2.27.0",
"bash-language-server": "^1.6.1",
"@typescript-eslint/eslint-plugin": "^3.10.1",
"@typescript-eslint/parser": "^3.10.1",
"bash-language-server": "^1.17.0",
"dictionary-en": "^3.0.0",
"dockerfile-language-server-nodejs": "^0.0.22",
"eslint": "^6.8.0",
"eslint": "^7.5.0",
"eslint-config-prettier": "^6.7.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jest": "^23.8.2",
Expand All @@ -17,14 +17,15 @@
"jest-github-actions-reporter": "^1.0.2",
"lerna": "^3.13.2",
"precise-commits": "^1.0.2",
"prettier": "^2.0.5",
"prettier": "^2.1.2",
"sql-language-server": "^0.11.4",
"typescript": "~3.9.5",
"typescript": "~4.0.2",
"unified-language-server": "^0.3.0",
"vscode-css-languageserver-bin": "^1.4.0",
"vscode-html-languageserver-bin": "^1.4.0",
"vscode-json-languageserver-bin": "^1.0.1",
"yaml-language-server": "~0.4.0"
"yaml-language-server": "^0.12.0",
"vscode-json-languageservice": "^3.9.1 <3.10.0"
},
"husky": {
"hooks": {}
Expand Down
9 changes: 3 additions & 6 deletions packages/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,18 @@ module.exports = {
'**/_*.ts',
'**/_*.d.ts',
'**/typings/**/*.d.ts',
'**/dist/*'
'**/dist/*',
'packages/.eslintrc.js'
],
parser: '@typescript-eslint/parser',
parserOptions: {
project: 'packages/tsconfig.eslint.json'
},
plugins: ['@typescript-eslint', 'jest', 'import'],
rules: {
'@typescript-eslint/ban-ts-ignore': 'warn',
'@typescript-eslint/camelcase': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/interface-name-prefix': [
'error',
{ prefixWithI: 'always' }
],
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-empty-interface': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: true }],
Expand Down
2 changes: 1 addition & 1 deletion packages/jupyterlab-go-to-definition/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const reuseFromUpstream = [
];

let local = {
globals: { 'ts-jest': { tsConfig: 'tsconfig.json' } },
globals: { 'ts-jest': { tsconfig: 'tsconfig.json' } },
testRegex: `.*\.spec\.tsx?$`,
transform: {
'\\.(ts|tsx)?$': 'ts-jest',
Expand Down
8 changes: 4 additions & 4 deletions packages/jupyterlab-go-to-definition/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@jupyterlab/apputils": "~2.2.0",
"@jupyterlab/codeeditor": "~2.2.0",
"@jupyterlab/codemirror": "~2.2.0",
"@jupyterlab/coreutils": "~4.0.0",
"@jupyterlab/coreutils": "~4.2.0",
"@jupyterlab/docmanager": "~2.2.0",
"@jupyterlab/docregistry": "~2.2.0",
"@jupyterlab/fileeditor": "~2.2.0",
Expand All @@ -65,11 +65,11 @@
"@types/chai": "^4.1.7",
"@types/jest": "^23.3.11",
"chai": "^4.2.0",
"jest": "^24.7.1",
"jest": "^26.0.0",
"jest-junit": "^8.0.0",
"rimraf": "^2.6.1",
"ts-jest": "^24.0.2",
"typescript": "~3.9.5",
"ts-jest": "^26.4.3",
"typescript": "~4.0.2",
"@babel/preset-env": "^7.4.3"
},
"jupyterlab": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ function getModifierState(event: MouseEvent, modifierKey: string): boolean {
}
}

export class CodeMirrorExtension extends CodeMirrorTokensProvider
export class CodeMirrorExtension
extends CodeMirrorTokensProvider
implements IEditorExtension {
jumper: CodeJumper;
static modifierKey: KeyModifier;
Expand Down
6 changes: 3 additions & 3 deletions packages/jupyterlab-go-to-definition/src/jumpers/jumper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ export abstract class CodeJumper {
}
}

handle_kernel_inspect(response: IIOPubMessage, fallback: Function) {
handle_kernel_inspect(response: IIOPubMessage, fallback: () => void) {
let obj: any = response.content;
if (obj.name === 'stdout') {
let data = JSON.parse(obj.text);
Expand Down Expand Up @@ -386,8 +386,8 @@ export abstract class CodeJumper {
protected inspect_and_jump(
context: TokenContext,
cell_of_origin_analyzer: LanguageAnalyzer,
fallback: Function,
callback: Function
fallback: () => void,
callback: () => void
) {
let code = cell_of_origin_analyzer.definitionLocationQuery(context);

Expand Down
Loading