diff --git a/.github/workflows/release-nightly.yaml b/.github/workflows/release.yaml similarity index 79% rename from .github/workflows/release-nightly.yaml rename to .github/workflows/release.yaml index 56d3a01..e22f2d5 100644 --- a/.github/workflows/release-nightly.yaml +++ b/.github/workflows/release.yaml @@ -35,6 +35,15 @@ jobs: exit 1 fi + - name: Check vs code package.json version matches flake version + shell: bash + run: | + if ! [ $(grep '"version": "' vs-code-extension/package.json | cut -d'"' -f 4) = $(grep '# CI:CD-VERSION$' flake.nix | cut -d'"' -f 2) ]; + then + echo "Version mismatch between vs code package.json and flake" + exit 1 + fi + - uses: cachix/install-nix-action@v27 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 501e100..8c24ad5 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A language server for configuration files. The goal is to make editing config fi |-------------|-------------|--------------|---------|---------------|--------------|----------|------------------| | aliases | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | fstab | ✅ | ✅ | ✅ | ❓ | ❓ | ❓ | 🟡 | -| hosts | ✅ | ✅ | ✅ | ✅ | ❓ | ❓ | 🟡 | +| hosts | ✅ | ✅ | ✅ | ✅ | ❓ | ❓ | ✅ | | ssh_config | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | sshd_config | ✅ | ✅ | ✅ | ❓ | ✅ | ❓ | ✅ | | wireguard | ✅ | ✅ | ✅ | ✅ | ❓ | ❓ | 🟡 | diff --git a/flake.nix b/flake.nix index d7c5018..2a3ff7c 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,8 @@ pname = "github.com/Myzel394/config-lsp"; version = version; src = ./server; - vendorHash = "sha256-s+sjOVvqU20+mbEFKg+RCD+dhScqSatk9eseX2IioPI"; + vendorHash = "sha256-eO1eY+2XuOCd/dKwgFtu05+bnn/Cv8ZbUIwRjCwJF+U="; + ldflags = [ "-s" "-w" ]; checkPhase = '' go test -v $(pwd)/... ''; diff --git a/vs-code-extension/.vscodeignore b/vs-code-extension/.vscodeignore index 2ca7fc3..0740772 100644 --- a/vs-code-extension/.vscodeignore +++ b/vs-code-extension/.vscodeignore @@ -12,3 +12,6 @@ client/node_modules/** !client/node_modules/vscode-languageserver-protocol/** !client/node_modules/vscode-languageserver-types/** !client/node_modules/semver/** + +flake.nix +build-extension.sh diff --git a/vs-code-extension/package.json b/vs-code-extension/package.json index a7fc5c5..ce8ce48 100644 --- a/vs-code-extension/package.json +++ b/vs-code-extension/package.json @@ -1,14 +1,13 @@ { - "name": "config-lsp-vs-code-extension", - "description": "A language server example using language services to support embedded languages", - "author": "Microsoft Corporation", - "license": "MIT", + "name": "config-lsp", + "description": "Language Features (completions, diagnostics, etc.) for your config files: gitconfig, fstab, aliases, hosts, wireguard, ssh_config, sshd_config, and more to come!", + "author": "Myzel394", "version": "0.1.0", "repository": { "type": "git", - "url": "https://github.com/Microsoft/vscode-extension-samples" + "url": "https://github.com/Myzel394/config-lsp" }, - "publisher": "vscode-samples", + "publisher": "myzel394", "categories": [], "keywords": [], "engines": { @@ -34,6 +33,6 @@ "@typescript-eslint/parser": "^7.14.0", "eslint": "^9.11.1", "typescript": "^5.5.2", - "@types/vscode": "^1.93.0" + "@types/vscode": "^1.74.0" } } diff --git a/vs-code-extension/tsconfig.tsbuildinfo b/vs-code-extension/tsconfig.tsbuildinfo deleted file mode 100644 index 81f1d74..0000000 --- a/vs-code-extension/tsconfig.tsbuildinfo +++ /dev/null @@ -1 +0,0 @@ -{"root":["./src/extension.ts"],"version":"5.6.2"} \ No newline at end of file