Skip to content

Commit

Permalink
Change NPM namespace to @jupyter-lsp
Browse files Browse the repository at this point in the history
  • Loading branch information
krassowski committed Sep 27, 2022
1 parent 6c536c7 commit 51eed62
Show file tree
Hide file tree
Showing 37 changed files with 133 additions and 137 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Changelog

### `@krassowski/jupyterlab-lsp 4.0.0` (not-yet-released)
### `@jupyter-lsp/jupyterlab-lsp 4.0.0-alpha.0` (not-yet-released)

- features:
- implement jump target selector and jump to references ([#739])
Expand All @@ -11,6 +11,7 @@
- fix `undefined` being inserted for path-like completion items with no `insertText` ([#833])
- reduce signature flickering when typing and hover flicker when moving mouse ([#836])
- refactoring:
- changed NPM packages namespace from `@krassowski` to `@jupyter-lsp` ([#862])
- move client capabilities to features ([#738])
- documentation:
- add missing `--channel` to conda instruction for texlab ([#789], thanks @justin-f-perez)
Expand Down
2 changes: 1 addition & 1 deletion atest/05_Features/Signature.robot
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Force Tags feature:signature


*** Variables ***
${SIGNATURE PLUGIN ID} @krassowski/jupyterlab-lsp:signature
${SIGNATURE PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:signature
${SIGNATURE_BOX} css:.lsp-signature-help
${SIGNATURE_HIGHLIGHTED_ARG} css:.lsp-signature-help mark
${SIGNATURE_DETAILS_CSS} .lsp-signature-help details
Expand Down
2 changes: 1 addition & 1 deletion atest/Keywords.resource
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Initialize User Settings

Reset Plugin Settings
[Arguments] ${package}=jupyterlab-lsp ${plugin}=plugin
${LSP PLUGIN SETTINGS FILE} = Set Variable @krassowski${/}${package}${/}${plugin}.jupyterlab-settings
${LSP PLUGIN SETTINGS FILE} = Set Variable @jupyter-lsp${/}${package}${/}${plugin}.jupyterlab-settings
Create File ${SETTINGS DIR}${/}${LSP PLUGIN SETTINGS FILE} {}

Tear Down Everything
Expand Down
10 changes: 5 additions & 5 deletions atest/Variables.resource
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ ${CM CURSOR} css:.CodeMirror-cursor
${CM CURSORS}
... css:.jp-MainAreaWidget:not(.lm-mod-hidden) .CodeMirror-cursors:not([style='visibility: hidden'])
# 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
${LSP PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:plugin
${COMPLETION PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:completion
${HIGHLIGHTS PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:highlights
${JUMP PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:jump_to
${DIAGNOSTICS PLUGIN ID} @jupyter-lsp/jupyterlab-lsp:diagnostics
${CSS USER SETTINGS} .jp-SettingsRawEditor-user
${JLAB XP CLOSE SETTINGS}
... ${JLAB XP DOCK TAB}\[contains(., 'Settings')]/*[contains(@class, 'm-TabBar-tabCloseIcon')]
Expand Down
2 changes: 1 addition & 1 deletion docs/Installation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
" 'chktex' \\\n",
" 'jupyter-lsp={JUPYTER_LSP_VERSION}' \\\n",
" && jupyter labextension install --no-build \\\n",
" '@krassowski/jupyterlab-lsp@{JUPYTERLAB_LSP_VERSION}' \\\n",
" '@jupyter-lsp/jupyterlab-lsp@{JUPYTERLAB_LSP_VERSION}' \\\n",
" && jupyter lab build --dev-build=False --minimize=True \\\n",
" && conda clean --all -f -y \\\n",
" && rm -rf \\\n",
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@
"bootstrap": "jlpm --no-optional --prefer-offline && lerna bootstrap && jlpm clean && jlpm build && jlpm lint",
"build": "jlpm build:schema && jlpm build:meta && jlpm build:ws && jlpm build:labextension",
"build:schema": "lerna run build:schema --stream",
"build:meta": "lerna run build --stream --scope @krassowski/jupyterlab-lsp-metapackage",
"build:meta": "lerna run build --stream --scope @jupyter-lsp/jupyterlab-lsp-metapackage",
"build:labextension": "lerna run build:labextension --stream",
"build:completion-theme": "lerna run build --stream --scope @krassowski/completion-theme",
"build:theme-vscode": "lerna run build --stream --scope @krassowski/theme-vscode",
"build:theme-material": "lerna run build --stream --scope @krassowski/theme-material",
"build:jupyterlab-lsp": "lerna run build --stream --scope @krassowski/jupyterlab-lsp",
"build:completion-theme": "lerna run build --stream --scope @jupyter-lsp/completion-theme",
"build:theme-vscode": "lerna run build --stream --scope @jupyter-lsp/theme-vscode",
"build:theme-material": "lerna run build --stream --scope @jupyter-lsp/theme-material",
"build:jupyterlab-lsp": "lerna run build --stream --scope @jupyter-lsp/jupyterlab-lsp",
"build:ws": "lerna run build --stream --scope lsp-ws-connection",
"build:jump": "lerna run build --stream --scope @krassowski/code-jumpers",
"build:jump": "lerna run build --stream --scope @jupyter-lsp/code-jumpers",
"watch": "lerna run --parallel watch",
"bundle": "lerna run --parallel bundle",
"clean": "lerna run --parallel clean",
Expand Down
6 changes: 3 additions & 3 deletions packages/_example-extractor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@krassowski/jupyterlab-lsp-example-extractor",
"description": "Example extractor package from @krassowski/jupyterlab-lsp",
"name": "@jupyter-lsp/jupyterlab-lsp-example-extractor",
"description": "Example extractor package from @jupyter-lsp/jupyterlab-lsp",
"version": "0.0.0",
"private": true,
"main": "lib/index.js",
Expand All @@ -10,7 +10,7 @@
"lib/**/*.{js,ts}"
],
"dependencies": {
"@krassowski/jupyterlab-lsp": "^3.6"
"@jupyter-lsp/jupyterlab-lsp": "^4.0.0-alpha.0"
},
"devDependencies": {
"@babel/preset-env": "^7.4.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/_example-extractor/src/api.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IExtractedCode } from '@krassowski/jupyterlab-lsp';
import { IExtractedCode } from '@jupyter-lsp/jupyterlab-lsp';
import { expect } from 'chai';

import { extractor } from '.';
Expand Down
10 changes: 5 additions & 5 deletions packages/_example-extractor/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import {
ILSPCodeExtractorsManager,
RegExpForeignCodeExtractor
} from '@jupyter-lsp/jupyterlab-lsp';
import {
JupyterFrontEnd,
JupyterFrontEndPlugin
} from '@jupyterlab/application';
import {
ILSPCodeExtractorsManager,
RegExpForeignCodeExtractor
} from '@krassowski/jupyterlab-lsp';

const NS = '@krassowski/jupyterlab-lsp-example-extractor';
const NS = '@jupyter-lsp/jupyterlab-lsp-example-extractor';

export const extractor = new RegExpForeignCodeExtractor({
language: 'foo',
Expand Down
6 changes: 3 additions & 3 deletions packages/_klingon-integration/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@krassowski/jupyterlab-lsp-klingon-integration",
"description": "Klingon language integration for testing @krassowski/jupyterlab-lsp",
"name": "@jupyter-lsp/jupyterlab-lsp-klingon-integration",
"description": "Klingon language integration for testing @jupyter-lsp/jupyterlab-lsp",
"version": "0.0.0",
"private": true,
"main": "lib/index.js",
Expand All @@ -20,7 +20,7 @@
},
"jupyterlab": {
"extension": true,
"outputDir": "../../python_packages/klingon_ls_specification/klingon_ls_specification/labextensions/@krassowski/jupyterlab-lsp-klingon-integration"
"outputDir": "../../python_packages/klingon_ls_specification/klingon_ls_specification/labextensions/@jupyter-lsp/jupyterlab-lsp-klingon-integration"
},
"scripts": {
"build": "jlpm run build:lib && jlpm run build:labextension",
Expand Down
2 changes: 1 addition & 1 deletion packages/_klingon-integration/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
JupyterFrontEndPlugin
} from '@jupyterlab/application';

const NS = '@krassowski/jupyterlab-lsp-klingon-integration';
const NS = '@jupyter-lsp/jupyterlab-lsp-klingon-integration';

const plugin: JupyterFrontEndPlugin<void> = {
id: `${NS}:PLUGIN`,
Expand Down
4 changes: 2 additions & 2 deletions packages/code-jumpers/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@krassowski/code-jumpers",
"name": "@jupyter-lsp/code-jumpers",
"version": "1.2.0",
"description": "Implementation underlying the jump to definition functionality in JupyterLab-LSP",
"keywords": [
Expand Down Expand Up @@ -56,6 +56,6 @@
},
"jupyterlab": {
"extension": false,
"outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@krassowski/code-jumpers"
"outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@jupyter-lsp/code-jumpers"
}
}
4 changes: 2 additions & 2 deletions packages/completion-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@krassowski/completion-theme",
"name": "@jupyter-lsp/completion-theme",
"version": "3.3.0",
"description": "Completion theme manager for JupyterLab-LSP",
"keywords": [
Expand Down Expand Up @@ -42,6 +42,6 @@
"jupyterlab": {
"extension": true,
"schemaDir": "schema",
"outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@krassowski/completion-theme"
"outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@jupyter-lsp/completion-theme"
}
}
5 changes: 2 additions & 3 deletions packages/completion-theme/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
KernelKind,
PLUGIN_ID
} from './types';
export * from './types';

export class CompletionThemeManager implements ILSPCompletionThemeManager {
protected current_icons: Map<string, LabIcon>;
Expand Down Expand Up @@ -173,8 +174,6 @@ export class CompletionThemeManager implements ILSPCompletionThemeManager {
}
}

const LSP_CATEGORY = 'Language server protocol';

export const COMPLETION_THEME_MANAGER: JupyterFrontEndPlugin<ILSPCompletionThemeManager> =
{
id: PLUGIN_ID,
Expand All @@ -195,7 +194,7 @@ export const COMPLETION_THEME_MANAGER: JupyterFrontEndPlugin<ILSPCompletionTheme
}
});
commandPalette.addItem({
category: LSP_CATEGORY,
category: trans.__('Language server protocol'),
command: command_id
});
return manager;
Expand Down
2 changes: 1 addition & 1 deletion packages/completion-theme/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ enum CompletionItemKind {

export type CompletionItemKindStrings = keyof typeof CompletionItemKind;

export const PLUGIN_ID = '@krassowski/completion-manager';
export const PLUGIN_ID = '@jupyter-lsp/completion-manager';

export type SvgString = string;

Expand Down
2 changes: 1 addition & 1 deletion packages/jupyterlab-lsp/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let local = {
reporters: [...upstream['reporters'], 'jest-github-actions-reporter'],
setupFiles: [
...upstream['setupFiles'],
'@krassowski/jupyterlab-lsp/lib/jest-shim.js'
'@jupyter-lsp/jupyterlab-lsp/lib/jest-shim.js'
]
};

Expand Down
14 changes: 7 additions & 7 deletions packages/jupyterlab-lsp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@krassowski/jupyterlab-lsp",
"version": "3.10.1",
"name": "@jupyter-lsp/jupyterlab-lsp",
"version": "4.0.0-alpha.0",
"description": "Language Server Protocol integration for JupyterLab",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -58,10 +58,10 @@
"watch:src": "tsc -w"
},
"dependencies": {
"@krassowski/code-jumpers": "~1.2.0",
"@krassowski/completion-theme": "~3.3.0",
"@krassowski/theme-material": "~2.1.1",
"@krassowski/theme-vscode": "~2.1.1",
"@jupyter-lsp/code-jumpers": "~1.2.0",
"@jupyter-lsp/completion-theme": "~3.3.0",
"@jupyter-lsp/theme-material": "~2.1.1",
"@jupyter-lsp/theme-vscode": "~2.1.1",
"lodash.mergewith": "^4.6.1",
"lsp-ws-connection": "~0.7.0"
},
Expand Down Expand Up @@ -144,6 +144,6 @@
}
},
"schemaDir": "schema",
"outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@krassowski/jupyterlab-lsp"
"outputDir": "../../python_packages/jupyterlab_lsp/jupyterlab_lsp/labextensions/@jupyter-lsp/jupyterlab-lsp"
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { ILSPCompletionThemeManager } from '@jupyter-lsp/completion-theme';
import { JupyterFrontEnd } from '@jupyterlab/application';
import { CodeEditor } from '@jupyterlab/codeeditor';
import {
Expand All @@ -8,7 +9,6 @@ import {
import { IDocumentWidget } from '@jupyterlab/docregistry';
import { NotebookPanel } from '@jupyterlab/notebook';
import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
import { ILSPCompletionThemeManager } from '@krassowski/completion-theme/lib/types';
import type * as CodeMirror from 'codemirror';

import { CodeCompletion as LSPCompletionSettings } from '../../_completion';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import {
ILSPCompletionThemeManager,
KernelKind
} from '@jupyter-lsp/completion-theme';
import { CodeEditor } from '@jupyterlab/codeeditor';
import {
CompletionConnector,
Expand All @@ -7,10 +11,6 @@ import {
} from '@jupyterlab/completer';
import { Session } from '@jupyterlab/services';
import { LabIcon } from '@jupyterlab/ui-components';
import {
ILSPCompletionThemeManager,
KernelKind
} from '@krassowski/completion-theme/lib/types';
import { JSONArray, JSONObject } from '@lumino/coreutils';
import type * as lsProtocol from 'vscode-languageserver-types';

Expand Down
2 changes: 1 addition & 1 deletion packages/jupyterlab-lsp/src/features/completion/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { ILSPCompletionThemeManager } from '@jupyter-lsp/completion-theme';
import {
JupyterFrontEnd,
JupyterFrontEndPlugin
Expand All @@ -6,7 +7,6 @@ import { ICompletionManager } from '@jupyterlab/completer';
import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
import { ISettingRegistry } from '@jupyterlab/settingregistry';
import { LabIcon } from '@jupyterlab/ui-components';
import { ILSPCompletionThemeManager } from '@krassowski/completion-theme/lib/types';

import completionSvg from '../../../style/icons/completion.svg';
import { CodeCompletion as LSPCompletionSettings } from '../../_completion';
Expand Down
10 changes: 5 additions & 5 deletions packages/jupyterlab-lsp/src/features/jump_to.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
import {
CodeJumper,
FileEditorJumper,
NotebookJumper
} from '@jupyter-lsp/code-jumpers';
import {
JupyterFrontEnd,
JupyterFrontEndPlugin
Expand All @@ -11,11 +16,6 @@ import { INotebookTracker } from '@jupyterlab/notebook';
import { ISettingRegistry } from '@jupyterlab/settingregistry';
import { ITranslator, TranslationBundle } from '@jupyterlab/translation';
import { LabIcon } from '@jupyterlab/ui-components';
import {
CodeJumper,
FileEditorJumper,
NotebookJumper
} from '@krassowski/code-jumpers';
import { AnyLocation } from 'lsp-ws-connection/lib/types';
import type * as lsp from 'vscode-languageserver-protocol';

Expand Down
6 changes: 3 additions & 3 deletions packages/jupyterlab-lsp/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ export * from './tokens';
/** Component- and feature-specific APIs */
export * from './api';

import { COMPLETION_THEME_MANAGER } from '@jupyter-lsp/completion-theme';
import { plugin as THEME_MATERIAL } from '@jupyter-lsp/theme-material';
import { plugin as THEME_VSCODE } from '@jupyter-lsp/theme-vscode';
import {
JupyterFrontEnd,
JupyterFrontEndPlugin
Expand All @@ -18,9 +21,6 @@ import { ISettingRegistry } from '@jupyterlab/settingregistry';
import { IStatusBar } from '@jupyterlab/statusbar';
import { ITranslator, nullTranslator } from '@jupyterlab/translation';
import { IFormComponentRegistry } from '@jupyterlab/ui-components';
import { COMPLETION_THEME_MANAGER } from '@krassowski/completion-theme';
import { plugin as THEME_MATERIAL } from '@krassowski/theme-material';
import { plugin as THEME_VSCODE } from '@krassowski/theme-vscode';
import { Signal } from '@lumino/signaling';

import '../style/index.css';
Expand Down
2 changes: 1 addition & 1 deletion packages/jupyterlab-lsp/src/tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export interface ILSPCodeExtractorsManager {
): void;
}

export const PLUGIN_ID = '@krassowski/jupyterlab-lsp';
export const PLUGIN_ID = '@jupyter-lsp/jupyterlab-lsp';

export const ILSPFeatureManager = new Token<ILSPFeatureManager>(
PLUGIN_ID + ':ILSPFeatureManager'
Expand Down
4 changes: 2 additions & 2 deletions packages/lsp-ws-connection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"lsp",
"languageserver"
],
"homepage": "https://github.com/krassowski/jupyterlab-lsp/tree/master/packages/lsp-ws-connection",
"repository": "github:krassowski/jupyterlab-lsp",
"homepage": "https://github.com/jupyter-lsp/jupyterlab-lsp/tree/master/packages/lsp-ws-connection",
"repository": "github:jupyter-lsp/jupyterlab-lsp",
"dependencies": {
"vscode-languageserver-protocol": "^3.16.0",
"vscode-languageserver-types": "^3.16.0",
Expand Down
18 changes: 9 additions & 9 deletions packages/metapackage/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@krassowski/jupyterlab-lsp-metapackage",
"version": "3.10.1",
"name": "@jupyter-lsp/jupyterlab-lsp-metapackage",
"version": "4.0.0-alpha.0",
"description": "JupyterLab LSP - Meta Package. All of the packages used by JupyterLab LSP",
"homepage": "https://github.com/jupyter-lsp/jupyterlab-lsp",
"bugs": {
Expand All @@ -26,13 +26,13 @@
"watch": "tsc -b --watch --preserveWatchOutput"
},
"dependencies": {
"@krassowski/code-jumpers": "file:../code-jumpers",
"@krassowski/completion-theme": "file:../completion-theme",
"@krassowski/jupyterlab-lsp": "file:../jupyterlab-lsp",
"@krassowski/jupyterlab-lsp-example-extractor": "file:../_example-extractor",
"@krassowski/jupyterlab-lsp-klingon-integration": "file:../_klingon-integration",
"@krassowski/theme-material": "file:../theme-material",
"@krassowski/theme-vscode": "file:../theme-vscode",
"@jupyter-lsp/code-jumpers": "file:../code-jumpers",
"@jupyter-lsp/completion-theme": "file:../completion-theme",
"@jupyter-lsp/jupyterlab-lsp": "file:../jupyterlab-lsp",
"@jupyter-lsp/jupyterlab-lsp-example-extractor": "file:../_example-extractor",
"@jupyter-lsp/jupyterlab-lsp-klingon-integration": "file:../_klingon-integration",
"@jupyter-lsp/theme-material": "file:../theme-material",
"@jupyter-lsp/theme-vscode": "file:../theme-vscode",
"lsp-ws-connection": "file:../lsp-ws-connection"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 51eed62

Please sign in to comment.