Merge pull request #1 from elasticdotventures/feature/lsp-integration

feature/lsp integration

Author: elasticdotventures

.gitignore

@@ -7,3 +7,7 @@ node_modules
 logs/
 context_portal/
 *~
+justlang_lsp.log
+scripts/read-*.ts
+scripts/test-*.js
+*.ignore

.vscode-test.mjs

@@ -2,4 +2,8 @@ import { defineConfig } from '@vscode/test-cli';
 
 export default defineConfig({
 	files: 'out/test/**/*.test.js',
+	mocha: {
+		ui: 'bdd',
+		timeout: 20000,
+	}
 });

.vscodeignore

@@ -12,3 +12,7 @@ vsc-extension-quickstart.md
 **/*.map
 **/*.ts
 **/.vscode-test.*
+logs/
+context_portal/
+**/*~
+

CLAUDE.md

@@ -0,0 +1,22 @@
+
+
+three repos are provided. 
+justlang-lsp is the current target repo. it's an existing vscode extension for justlang offering *some* language functionality.   i.e. it should properly register the just language 
+
+../just-lsp.subrepo is a rust lsp provider, the lsp provider is design for zed editor which also has LSP support but it has never been ported or tested wtih vscode. 
+
+../vscode-languageserver-node-just is a heavily documented sample language service provider (code reference) 
+
+use sequential thinking mcp tool and context7 to plan the integration of just-lsp.subrepo into justlang-lsp using the vscode-languageserver-node as a reference.
+
+don't re-create files, it's better to copy files and the modify attribution in the header.
+
+develop a plan, then send to orchestrator, use code agents.  instruct each code agent session to always run `just test` and validate the new behaviors. 
+
+there is a custom packaging script scripts/package.js that is used to include files since we're using pnpm and vsce doesn't support that.
+
+after reviewing the code make a step by step plan, start with making sure you have a plan for detecting if the rust-lsp binary is installed (and for installing it into the tests early, probably first thing)
+
+change name from justlang-lsp.justlang-lsp to promptexecution.justlang-lsp
+
+

LICENSE LICENSE.mdLICENSE renamed to LICENSE.md

@@ -1,9 +1,59 @@
-justlang type support for justfile
+# JustLang-LSP Extension
 
-justfiles can be: justfile, *.just, Justfile (any capitalization), .justfile
+## Overview
+JustLang-LSP is a Visual Studio Code extension designed to enhance the development experience by providing task automation and integration with JustLang syntax. It supports `Justfile` (any capitalization), `.justfile`, and `*.just` formats. This extension leverages the VS Code API to register commands and task providers, enabling seamless execution of tasks defined in JustLang files.
 
-* https://just.systems/man/en/visual-studio-code.html
+This extension now includes a language client for the `just-lsp` language server, providing features like completion, diagnostics, and more.
 
+## Features
+- **Language Server Integration**: Connects to the `just-lsp` language server for advanced language features.
+- **Task Provider Integration**: Automatically detects and registers tasks from JustLang files (`Justfile`, `.justfile`, or `*.just`).
+- **Command Registration**: Includes a sample command (`justlang-lsp.helloWorld`) for demonstration purposes.
+- **Compatibility**: Ensures proper integration with VS Code's command and subscription mechanisms.
+- **Syntax Highlighting**: Provides syntax highlighting for JustLang files using TextMate grammar (`syntaxes/just.tmLanguage.yaml`).
+- **Language Configuration**: Adds language configuration for JustLang files (`language-configuration.json`), including comments, brackets, and auto-closing pairs.
 
+## Requirements
 
+This extension requires the `just-lsp` language server to be installed on your system. You can install it by following the instructions in the [just-lsp repository](https://github.com/your-repo/just-lsp).
 
+Once installed, you can either add the `just-lsp` executable to your system's `PATH` or specify the path to the executable in your VS Code settings using the `justlang-lsp.server.path` setting.
+
+## How to Use
+1. Install the extension in Visual Studio Code.
+2. Install the `just-lsp` language server.
+3. Open a workspace containing a JustLang file (`Justfile`, `.justfile`, or `*.just`).
+4. Run tasks directly from the VS Code task interface.
+
+## Development
+### Prerequisites
+- Node.js
+- TypeScript
+- PNPM
+- Rust and Cargo
+
+### Setup
+1. Clone the repository.
+2. Run `pnpm install` to install dependencies.
+3. Use `pnpm run compile` to build the extension.
+
+### Testing
+Run `npm test` to execute the test suite.
+open a justfile
+    Developer: Inspect Editor Tokens and Scopes
+
+
+## References
+
+* https://code.visualstudio.com/api/references/contribution-points#contributes.languages
+
+## License
+This project is licensed under the MIT License. See the [LICENSE](LICENSE) file for details.
+
+
+### Attribution
+Syntax highlighting and language configuration features were adapted from the [wolfmah-vscode.just-syntax](https://github.com/wolfmah-vscode/just-syntax) repository under the Mozilla Public License 2.0 (MPL 2.0). See the [LICENSE](LICENSE) file for details.
+
+## Thanks
+* skellock
+* 

README.md

@@ -26,7 +26,7 @@ const esbuildProblemMatcherPlugin = {
 async function main() {
 	const ctx = await esbuild.context({
 		entryPoints: [
-			'src/extension.ts'
+			'src/lsp.ts'
 		],
 		bundle: true,
 		format: 'cjs',
@@ -36,6 +36,7 @@ async function main() {
 		platform: 'node',
 		outfile: 'dist/extension.js',
 		external: ['vscode'],
+		mainFields: ['module', 'main'],
 		logLevel: 'silent',
 		plugins: [
 			/* add to the end of plugins array */

esbuild.js

@@ -1,34 +1,78 @@
 # Justfile for building, testing, packaging, and installing the VSCode Justfile LSP provider
 
+
 # 🤓 export display for GUI applications, ALWAYS Use this, it is set correctly on init.
-DISPLAY:="localhost:10.0"
+# TODO: only set $DISPLAY if the env $env:DISPALY
+#DISPLAY:="localhost:10.0"
+DISPLAY := env("DISPLAY", "localhost:10.0")
 VSCODE:="~/.dotfiles/vscode.sh"
 
 EXT_VER := `jq -r .version package.json`
 
+bump-patch:
+    git add -u .
+    git commit -m "Bump patch version v{{EXT_VER}}"
+    pnpm version patch
+
 run-debug-extension:
     pnpm run compile && DISPLAY={{DISPLAY}} pnpm run test
 
 # Build the VSCode extension
 build:
     . $HOME/.nvm/nvm.sh
-    pnpm install
     pnpm run compile
 
+package-clean:
+    rm -rf out && pnpm run compile-tests  
+
 # Test the VSCode extension
 test:
-    # this will appear on operators screen (useful for debugging)
+    # Upgrade everything to TypeScript and precompile tests
+    just build
+    NODE_OPTIONS='--import=tsx' pnpm exec mocha ./src/test/language-configuration-accessibility.test.ts
+    pnpm run compile-tests || (echo "Precompiled tests failed. Skipping extension host tests." && exit 1)
+    # Run extension host tests only if precompiled tests pass
     just package
-    just install
-    export DISPLAY={{DISPLAY}} && pnpm run test
+    export DISPLAY={{DISPLAY}} && pnpm exec vscode-test
+
+test-lsp:
+    #!/bin/bash
+    # MUST BE RUN AS /bin/bash so that {} aren't interpolated by lsp
+    # THIS WONT WORK: no content header
+    # echo '{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"capabilities":{}}}' | just-lsp  
+    rm foo || true
+    echo -e 'Content-Length: 76\r\n\r\n{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"capabilities":{}}}' | just-lsp --log foo
+    cat foo
 
 # Package the VSCode extension into a .vsix file
 package:
     . $HOME/.nvm/nvm.sh
     pnpm run compile
-    pnpm install -g @vscode/vsce
-    vsce package
+    node scripts/package.js
+    @just package-check
+
+
+package-check:
+    #!/bin/bash
+    # check if the extension file is less than 1 minute old using {{EXT_VER}}
+    FILENAME="./justlang-lsp-{{EXT_VER}}.vsix"
+    if [ -f "$FILENAME" ] && [ $(($(date +%s) - $(stat -c %Y "$FILENAME"))) -lt 60 ]; then \
+        echo "👍🏻 file $FILENAME"
+    else \
+        echo "😭 file $FILENAME missing or too old"; \
+    fi  
+
+
+package-inspect:
+    unzip justlang-lsp-{{EXT_VER}}.vsix -d vsix-content
+    tree vsix-content
+    @echo "🤔 remember to cleanup ./vsix-content when finished"
+
 
 # Install the VSCode extension
 install:
-    {{VSCODE}} --install-extension ./vscode-just-lsp-*.vsix
+    pnpm install
+
+package-install:
+    {{VSCODE}} --install-extension ./justlang-lsp-{{EXT_VER}}.vsix
+

icons/robot.png

@@ -0,0 +1,45 @@
+{
+  // 1. Comment settings
+  "comments": {
+    "lineComment": "#"
+  },
+
+  // 2. Bracket pairs for matching & navigation
+  "brackets": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"]
+  ],
+
+  // 3. Auto‑closing on typing the open character
+  "autoClosingPairs": [
+    { "open": "{", "close": "}" },
+    { "open": "[", "close": "]" },
+    { "open": "(", "close": ")" },
+    { "open": "\"", "close": "\"" },
+    { "open": "'", "close": "'" },
+    { "open": "`", "close": "`" }
+  ],
+
+  // 4. When you select a region and type an opener, wrap with these pairs
+  "surroundingPairs": [
+    { "open": "{", "close": "}" },
+    { "open": "[", "close": "]" },
+    { "open": "(", "close": ")" },
+    { "open": "\"", "close": "\"" },
+    { "open": "'", "close": "'" },
+    { "open": "`", "close": "`" }
+  ],
+
+  // 5. Define what VS Code considers a “word” for double‑click, etc.
+  "wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\#\\%\\^\\&\\*\\(\\)\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\",\\.\\<\\>\\/\\?\\s]+)",
+
+  // 6. Folding by indentation and region markers
+  "folding": {
+    "offSide": true,
+    "markers": {
+      "start": "^\\s*#region\\b",
+      "end": "^\\s*#endregion\\b"
+    }
+  }
+}