Merge pull request #33863 from vespa-engine/magnus/lsp-deploy-changenotes

Magnus/lsp deploy changenotes

Author: Mangern

.github/workflows/lspDeploy.yml

@@ -80,6 +80,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          echo "## What's New" | cat ./clients/github-release/README.md.in - ./resources/CHANGENOTES.txt > ./clients/github-release/README.md
           gh release create lsp-v${{ steps.retrieve_version.outputs.VERSION }} \
             --notes-file ./clients/github-release/README.md \
             --latest=false \

…-server/clients/github-release/README.md …rver/clients/github-release/README.md.inintegration/schema-language-server/clients/github-release/README.md renamed to integration/schema-language-server/clients/github-release/README.md.in integration/schema-language-server/clients/github-release/README.md renamed to integration/schema-language-server/clients/github-release/README.md.in

@@ -50,4 +50,4 @@ lspconfig.schemals.setup{
 ```
 
 ### Manual Installation
-If you don't want to use lspconfig you can refer to the [LSP documentation for Neovim](https://neovim.io/doc/user/lsp.html) for manually registering the server.
+If you don't want to use lspconfig you can refer to the [LSP documentation for Neovim](https://neovim.io/doc/user/lsp.html) for manually registering the server.

integration/schema-language-server/clients/intellij/build.gradle.kts

@@ -6,11 +6,14 @@ plugins {
 
 group = "ai.vespa.schemals"
 version = File("VERSION").inputStream().readBytes().toString(Charsets.UTF_8).trim()
+val changeNotesTxt = File("../../resources/CHANGENOTES.txt").inputStream().readBytes().toString(Charsets.UTF_8)
 val JAVA_VERSION = "17"
 
 repositories {
   mavenCentral()
 
+  mavenLocal()
+
   maven {
     url = uri("https://repo.eclipse.org/content/repositories/lemminx")
     metadataSources {
@@ -19,7 +22,6 @@ repositories {
     }
   }
 
-  mavenLocal()
   maven {
     url = uri("file://${System.getProperty("user.home")}/.m2/repository")
     metadataSources {
@@ -101,6 +103,19 @@ tasks {
   patchPluginXml {
     sinceBuild.set("232")
     untilBuild.set(provider { null })
+
+    // Split changeNotesTxt into lines and wrap each line in <li></li>
+    changeNotes.set(
+      buildString {
+        append("<ul>")
+        changeNotesTxt
+          .lineSequence()
+          .filter { it.isNotBlank() }
+          .map { it.trim().removePrefix("-").trim() }
+          .forEach { append("<li>$it</li>") }
+        append("</ul>")
+      }
+    )
   }
 
   signPlugin {

integration/schema-language-server/clients/intellij/src/main/resources/META-INF/plugin.xml

@@ -32,10 +32,6 @@
 The plugin requires <a href="https://docs.vespa.ai/en/vespa-cli.html">Vespa CLI</a> to be installed to be able to run Vespa Queries from <code>.yql</code> files.
 
   ]]></description>
-  <change-notes><![CDATA[
-<h2>Simple support for YQL</h2>
-The plugin now supports syntax highlighting of <code>.yql</code> files, in addition to run the queries directly from the editor.
-]]></change-notes>
   <depends>com.intellij.modules.platform</depends>
   <depends>com.redhat.devtools.lsp4ij</depends>
   <extensions defaultExtensionNs="com.redhat.devtools.lsp4ij">

…language-server/clients/vscode/README.md …guage-server/clients/vscode/README.md.inintegration/schema-language-server/clients/vscode/README.md renamed to integration/schema-language-server/clients/vscode/README.md.in integration/schema-language-server/clients/vscode/README.md renamed to integration/schema-language-server/clients/vscode/README.md.in

@@ -85,7 +85,8 @@
     "copy-images": "cp ../../resources/* ./images",
     "langserver-install": "mkdir -p server && cp ../../language-server/target/schema-language-server-jar-with-dependencies.jar ./server/ && npm run lemminx-install",
     "lemminx-install": "mkdir -p server && cp ../../lemminx-vespa/target/lemminx-vespa-jar-with-dependencies.jar ./server/",
-    "publish": "npm run compile && node out/publish.js"
+    "changenotes": "echo \"## What's New\" | cat ./README.md.in - ../../resources/CHANGENOTES.txt > README.md",
+    "publish": "npm run compile && npm run changenotes && node out/publish.js"
   },
   "devDependencies": {
     "@types/hasbin": "^1.2.2",

integration/schema-language-server/clients/vscode/package.json

@@ -0,0 +1,4 @@
+- Added support for formatting Schema files and selections.
+- Added progress indication when indexing large workspaces.
+- Added basic support for completion in YQL files.
+- Minor bug fixes.