From 6cb9f864a26cefb700e8f08ae304c94268d2295a Mon Sep 17 00:00:00 2001 From: Alex Kanunnikov Date: Tue, 13 Feb 2024 11:05:49 +0300 Subject: [PATCH] EmberTooling naming --- .github/workflows/workflow.yaml | 6 ++--- .gitignore | 4 ++-- .vscode/launch.json | 6 ++--- .vscodeignore | 20 ++++++++--------- DEBUGGING.md | 2 +- package.json | 40 ++++++++++++++++----------------- server.js | 4 ++-- src/extension.ts | 14 ++++++------ src/worker-extension.ts | 8 +++---- 9 files changed, 52 insertions(+), 52 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index a73b73b..b5f394b 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 3.1.x - + - name: install gitversion tool uses: gittools/actions/gitversion/setup@v0.9 with: @@ -76,8 +76,8 @@ jobs: - name: upload vsix as artifact uses: actions/upload-artifact@v2 with: - name: vscode-ember-unstable-${{steps.gitversion.outputs.majorMinorPatch}}.vsix - path: ${{github.workspace}}/vscode-ember-unstable-${{steps.gitversion.outputs.majorMinorPatch}}.vsix + name: vscode-ember-${{steps.gitversion.outputs.majorMinorPatch}}.vsix + path: ${{github.workspace}}/vscode-ember-${{steps.gitversion.outputs.majorMinorPatch}}.vsix - name: create a release if: github.ref == 'refs/heads/master' diff --git a/.gitignore b/.gitignore index 40b262b..4004bb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ out server node_modules -vscode-ember-unstable* +vscode-ember* .vsix .vscode-test-web dist -yarn-error.log \ No newline at end of file +yarn-error.log diff --git a/.vscode/launch.json b/.vscode/launch.json index 24bd7c7..cf7617b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,13 +18,13 @@ } }, { - "name":"Attach to UELS Server", + "name":"Attach to ELS Server", "type":"node", "request":"attach", - "port":6004, + "port":6003, "sourceMaps":true, "outFiles":[ - "${workspaceRoot}/node_modules/@lifeart/ember-language-server/lib/**/*.js" + "${workspaceRoot}/node_modules/@ember-tooling/ember-language-server/lib/**/*.js" ], "restart":true, "smartStep":true diff --git a/.vscodeignore b/.vscodeignore index 546311e..5505c13 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -23,15 +23,15 @@ node_modules/** !node_modules/vscode-jsonrpc/lib/common/**/*.js !node_modules/vscode-languageserver-types/package.json !node_modules/vscode-languageserver-types/lib/**/*.js -!node_modules/@lifeart/ember-language-server/package.json -!node_modules/@lifeart/ember-language-server/dist/** -!node_modules/@lifeart/ember-language-server/node_modules/find-up/** -!node_modules/@lifeart/ember-language-server/node_modules/find-up/** -!node_modules/@lifeart/ember-language-server/node_modules/locate-path/** -!node_modules/@lifeart/ember-language-server/node_modules/path-exists/** -!node_modules/@lifeart/ember-language-server/node_modules/p-locate/** -!node_modules/@lifeart/ember-language-server/node_modules/p-limit/** -!node_modules/@lifeart/ember-language-server/node_modules/yocto-queue/** +!node_modules/@ember-tooling/ember-language-server/package.json +!node_modules/@ember-tooling/ember-language-server/dist/** +!node_modules/@ember-tooling/ember-language-server/node_modules/find-up/** +!node_modules/@ember-tooling/ember-language-server/node_modules/find-up/** +!node_modules/@ember-tooling/ember-language-server/node_modules/locate-path/** +!node_modules/@ember-tooling/ember-language-server/node_modules/path-exists/** +!node_modules/@ember-tooling/ember-language-server/node_modules/p-locate/** +!node_modules/@ember-tooling/ember-language-server/node_modules/p-limit/** +!node_modules/@ember-tooling/ember-language-server/node_modules/yocto-queue/** !node_modules/find-up/** !node_modules/locate-path/** !node_modules/p-locate/** @@ -45,5 +45,5 @@ node_modules/** tsconfig.json DEBUGGING.md vsc-extension-quickstart.md -vscode-ember-unstable* +vscode-ember* webpack.config.js diff --git a/DEBUGGING.md b/DEBUGGING.md index 9000820..fa05c96 100644 --- a/DEBUGGING.md +++ b/DEBUGGING.md @@ -8,6 +8,6 @@ - Go to `ember-language-server` folder - Run `yarn link` - Go to `vscode-ember` folder - - Run `yarn link @lifeart/ember-language-server` + - Run `yarn link @ember-tooling/ember-language-server` - Add `ember-language-server` folder to workspace, you will have a [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) - Run debugger `Client + Server` diff --git a/package.json b/package.json index 17aec53..ddaa7a3 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,18 @@ { - "name": "vscode-ember-unstable", - "displayName": "Stable Ember Language Server", - "description": "(aka uELS, Unstable Ember Language Server), Provides features like auto complete, goto definition and diagnostics for Ember.js projects", + "name": "vscode-ember", + "displayName": "Ember Language Server", + "description": "Provides features like auto complete, goto definition and diagnostics for Ember.js projects", "author": "Aleksandr Kanunnikov ", "license": "MIT", "version": "3.0.53", - "publisher": "lifeart", + "publisher": "EmberTooling", "icon": "assets/icon.png", "keywords": [ "Ember.js", "Ember-CLI", "Glimmer", "Handlebars", - "Unstable Language server" + "Ember Language server" ], "engines": { "vscode": "^1.60.0" @@ -23,10 +23,10 @@ ], "repository": { "type": "git", - "url": "https://github.com/lifeart/vscode-ember" + "url": "https://github.com/ember-tooling/vscode-ember" }, "bugs": { - "url": "https://github.com/lifeart/vscode-ember/issues" + "url": "https://github.com/ember-tooling/vscode-ember/issues" }, "activationEvents": [ "onLanguage:handlebars", @@ -54,11 +54,11 @@ } ], "configuration": { - "title": "Unstable Ember Language Server", + "title": "Ember Language Server", "properties": { "els.server.debug.port": { "type": "number", - "default": 6004, + "default": 6003, "description": "Language server debug port" }, "els.server.debug.enabled": { @@ -82,7 +82,7 @@ "items": { "type": "string" }, - "description": "List of UELS addons paths to include." + "description": "List of ELS addons paths to include." }, "els.local.ignoredProjects": { "type": "array", @@ -124,10 +124,10 @@ "compile": "tsc -p ./", "watch": "yarn watch:client & yarn watch:server", "watch:client": "tsc -b -w", - "watch:server": "cd ./node_modules/@lifeart/ember-language-server && yarn watch", + "watch:server": "cd ./node_modules/@ember-tooling/ember-language-server && yarn watch", "postinstall": "yarn compile", - "clean:cache": "yarn cache clean @lifeart/ember-language-server", - "build:langserver": "yarn --cwd ./node_modules/@lifeart/ember-language-server prepublish", + "clean:cache": "yarn cache clean @ember-tooling/ember-language-server", + "build:langserver": "yarn --cwd ./node_modules/@ember-tooling/ember-language-server prepublish", "web:compile": "webpack", "web:watch": "webpack --watch", "web:package": "webpack --mode production", @@ -137,12 +137,12 @@ "lint:fix": "yarn lint --fix" }, "resolutions": { - "@lifeart/ember-language-server/find-up": "6.3.0", - "@lifeart/ember-language-server/find-up/locate-path": "7.1.0", - "@lifeart/ember-language-server/find-up/locate-path/p-locate": "6.0.0", - "@lifeart/ember-language-server/find-up/locate-path/p-locate/p-limit": "^4.0.0", - "@lifeart/ember-language-server/find-up/locate-path/p-locate/p-limit/yocto-queue": "^1.0.0", - "@lifeart/ember-language-server/find-up/path-exists": "5.0.0", + "@ember-tooling/ember-language-server/find-up": "6.3.0", + "@ember-tooling/ember-language-server/find-up/locate-path": "7.1.0", + "@ember-tooling/ember-language-server/find-up/locate-path/p-locate": "6.0.0", + "@ember-tooling/ember-language-server/find-up/locate-path/p-locate/p-limit": "^4.0.0", + "@ember-tooling/ember-language-server/find-up/locate-path/p-locate/p-limit/yocto-queue": "^1.0.0", + "@ember-tooling/ember-language-server/find-up/path-exists": "5.0.0", "eslint/find-up": "4.1.0", "webpack-cli/import-local/pkg-dir/find-up": "4.1.0" }, @@ -182,7 +182,7 @@ "p-limit": "^4.0.0", "yocto-queue": "^1.0.0", "path-exists": "5.0.0", - "@lifeart/ember-language-server": "2.30.1", + "@ember-tooling/ember-language-server": "2.30.1", "vscode-languageclient": "7.0.0" }, "volta": { diff --git a/server.js b/server.js index fcaff27..6090492 100644 --- a/server.js +++ b/server.js @@ -1,7 +1,7 @@ // This work-around needs for working the VSCode's debugging try { - module.exports = require('@lifeart/ember-language-server/lib/server').default; + module.exports = require('@ember-tooling/ember-language-server/lib/server').default; } catch { - module.exports = require('@lifeart/ember-language-server/dist/bundled/node-server').default; + module.exports = require('@ember-tooling/ember-language-server/dist/bundled/node-server').default; } diff --git a/src/extension.ts b/src/extension.ts index 6fcac77..148e356 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -70,7 +70,7 @@ export async function activate(context: ExtensionContext) { 'javascript', 'typescript', ], - outputChannelName: 'Unstable Ember Language Server', + outputChannelName: 'Ember Language Server', revealOutputChannelOn: RevealOutputChannelOn.Never, initializationOptions: { editor: 'vscode' }, synchronize: { @@ -90,7 +90,7 @@ export async function activate(context: ExtensionContext) { StatusBarAlignment.Right, 10 ); - ExtServerDebugBarItem.text = '$(sync) uELS'; + ExtServerDebugBarItem.text = '$(sync) ELS'; ExtServerDebugBarItem.command = ELS_COMMANDS.RESTART_SERVER; if (debugEnabled) { @@ -146,9 +146,9 @@ export async function activate(context: ExtensionContext) { // client can be deactivated on extension deactivation context.subscriptions.push( commands.registerCommand(ELS_COMMANDS.RESTART_SERVER, async () => { - ExtServerDebugBarItem.text = '$(sync) uELS [killing]'; + ExtServerDebugBarItem.text = '$(sync) ELS [killing]'; await disposable.stop(); - ExtServerDebugBarItem.text = '$(sync) uELS [starting]'; + ExtServerDebugBarItem.text = '$(sync) ELS [starting]'; disposable = createDisposable(); await disposable.onReady(); }) @@ -247,7 +247,7 @@ export async function activate(context: ExtensionContext) { // Create the language client and start the client. const disposable = new LanguageClient( 'emberLanguageServer', - 'Unstable Ember Language Server', + 'Ember Language Server', serverOptions, clientOptions, debugEnabled @@ -256,9 +256,9 @@ export async function activate(context: ExtensionContext) { disposable.onReady().then(() => { try { ExtServerDebugBarItem.text = - '$(sync) uELS [' + disposable['_serverProcess'].pid + ']'; + '$(sync) ELS [' + disposable['_serverProcess'].pid + ']'; } catch (e) { - ExtServerDebugBarItem.text = '$(sync) uELS [no PID]'; + ExtServerDebugBarItem.text = '$(sync) ELS [no PID]'; } disposable.onRequest( ExecuteCommandRequest.type.method, diff --git a/src/worker-extension.ts b/src/worker-extension.ts index b0c1900..698a6e3 100644 --- a/src/worker-extension.ts +++ b/src/worker-extension.ts @@ -48,7 +48,7 @@ export async function activate(context: ExtensionContext) { scheme: 'file', }; }), - outputChannelName: 'Unstable Ember Language Server', + outputChannelName: 'Ember Language Server', revealOutputChannelOn: RevealOutputChannelOn.Never, synchronize: {}, initializationOptions: { editor: 'vscode' }, @@ -171,16 +171,16 @@ function createWorkerLanguageClient( // Create a worker. The worker main file implements the language server. const serverMain = Uri.joinPath( context.extensionUri, - 'node_modules/@lifeart/ember-language-server/dist/bundled/start-worker-server.js' + 'node_modules/@ember-tooling/ember-language-server/dist/bundled/start-worker-server.js' ); const worker = new Worker(serverMain.toString(), { - name: '@lifeart/ember-language-server', + name: '@ember-tooling/ember-language-server', type: 'classic', }); // create the language server client to communicate with the server running in the worker return new LanguageClient( 'emberLanguageServer', - 'Unstable Ember Language Server', + 'Ember Language Server', clientOptions, worker );