Rename packages, fix incorrect unpack for linux and macos, add suppor…

…t unpack xz archives Signed-off-by: Konstantin Zaitsev <[email protected]>
hcengineering · Dec 17, 2024 · ed86b9d · ed86b9d
1 parent 0be8fa7
commit ed86b9d
Show file tree

Hide file tree

Showing 20 changed files with 279 additions and 195 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
@@ -229,6 +229,6 @@
     <orderEntry type="module" module-name="intellij.java.byteCodeViewer" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.vcs.github.json" scope="RUNTIME" />
     <orderEntry type="module" module-name="redhat.lsp4ij" scope="RUNTIME" />
-    <orderEntry type="module" module-name="hulylabs.hulycode.lang-configurator" scope="RUNTIME" />
+    <orderEntry type="module" module-name="hulylabs.langconfigurator" scope="RUNTIME" />
   </component>
 </module>
diff --git a/...r/src/hulylabs/hulycode/plugins/hulylangconfigurator/LanguageServerTemplateInstaller.java b/...r/src/hulylabs/hulycode/plugins/hulylangconfigurator/LanguageServerTemplateInstaller.java
diff --git a/...r/hulylabs.hulycode.lang-configurator.iml → ...onfigurator/hulylabs.langconfigurator.iml b/...r/hulylabs.hulycode.lang-configurator.iml → ...onfigurator/hulylabs.langconfigurator.iml
@@ -3,17 +3,38 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="redhat.lsp4ij" />
-    <orderEntry type="library" name="slf4j-api" level="project" />
+    <orderEntry type="module-library">
+      <library name="tukaani.xz" type="repository">
+        <properties include-transitive-deps="false" maven-id="org.tukaani:xz:1.10">
+          <verification>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/tukaani/xz/1.10/xz-1.10.jar">
+              <sha256sum>95c63c1a55b22dd6453890a419cc1a640f790bbf7d8ae82db1e30aefefb08888</sha256sum>
+            </artifact>
+          </verification>
+        </properties>
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/org/tukaani/xz/1.10/xz-1.10.jar!/" />
+        </CLASSES>
+        <JAVADOC>
+          <root url="jar://$MAVEN_REPOSITORY$/org/tukaani/xz/1.10/xz-1.10-javadoc.jar!/" />
+        </JAVADOC>
+        <SOURCES>
+          <root url="jar://$MAVEN_REPOSITORY$/org/tukaani/xz/1.10/xz-1.10-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library name="esotericsoftware.yamlbeans" type="repository">
         <properties include-transitive-deps="false" maven-id="com.esotericsoftware.yamlbeans:yamlbeans:1.17">
@@ -34,7 +55,5 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
   </component>
 </module>
diff --git a/...onfigurator/resources/META-INF/plugin.xml → ...onfigurator/resources/META-INF/plugin.xml b/...onfigurator/resources/META-INF/plugin.xml → ...onfigurator/resources/META-INF/plugin.xml
@@ -4,7 +4,7 @@
   <name>Huly Code Lang Configurator</name>
   <category>Other Tools</category>
   <id>hulylabs.hulycode.plugins.hulylangconfigurator</id>
-  <vendor>JetBrains</vendor>
+  <vendor>Huly Labs</vendor>
   <description>
     Configures languages support for opened files.
   </description>
@@ -14,10 +14,10 @@
 
   <extensions defaultExtensionNs="com.intellij">
     <applicationService
-      id="hulylabs.hulycode.plugins.hulylangconfigurator.templates.HulyLanguageServerTemplateManager"
-      serviceImplementation="hulylabs.hulycode.plugins.hulylangconfigurator.templates.HulyLanguageServerTemplateManager"/>
+      id="com.hulylabs.intellij.plugins.langconfigurator.templates.HulyLanguageServerTemplateManager"
+      serviceImplementation="com.hulylabs.intellij.plugins.langconfigurator.templates.HulyLanguageServerTemplateManager"/>
 
-    <editorNotificationProvider implementation="hulylabs.hulycode.plugins.hulylangconfigurator.LanguageServerConfigSetupNotificationProvider"/>
+    <editorNotificationProvider implementation="com.hulylabs.intellij.plugins.langconfigurator.LanguageServerConfigSetupNotificationProvider"/>
     <notificationGroup id="Language Server Configuration" displayType="BALLOON"/>
   </extensions>
 

diff --git a/...mplates/rust-analyzer/clientSettings.json → ...mplates/rust-analyzer/clientSettings.json b/...mplates/rust-analyzer/clientSettings.json → ...mplates/rust-analyzer/clientSettings.json
diff --git a/.../rust-analyzer/initializationOptions.json → .../rust-analyzer/initializationOptions.json b/.../rust-analyzer/initializationOptions.json → .../rust-analyzer/initializationOptions.json
diff --git a/...lsp-templates/rust-analyzer/template.yaml → ...lsp-templates/rust-analyzer/template.yaml b/...lsp-templates/rust-analyzer/template.yaml → ...lsp-templates/rust-analyzer/template.yaml
@@ -8,11 +8,13 @@ programArgs:
 binaryUrls:
   windows-x86_64: "https://github.com/rust-lang/rust-analyzer/releases/download/2024-12-09/rust-analyzer-x86_64-pc-windows-msvc.zip"
   windows-aarch64: "https://github.com/rust-lang/rust-analyzer/releases/download/2024-12-09/rust-analyzer-aarch64-pc-windows-msvc.zip"
-  unix-x86_64: "https://github.com/rust-lang/rust-analyzer/releases/download/2024-12-09/rust-analyzer-x86_64-unknown-linux-gnu.gz"
-  unix-aarch64: "https://github.com/rust-lang/rust-analyzer/releases/download/2024-12-09/rust-analyzer-aarch64-unknown-linux-gnu.gz"
+  linux-x86_64: "https://github.com/rust-lang/rust-analyzer/releases/download/2024-12-09/rust-analyzer-x86_64-unknown-linux-gnu.gz"
+  linux-aarch64: "https://github.com/rust-lang/rust-analyzer/releases/download/2024-12-09/rust-analyzer-aarch64-unknown-linux-gnu.gz"
   mac-x86_64: "https://github.com/rust-lang/rust-analyzer/releases/download/2024-12-09/rust-analyzer-x86_64-apple-darwin.gz"
   mac-aarch64: "https://github.com/rust-lang/rust-analyzer/releases/download/2024-12-09/rust-analyzer-aarch64-apple-darwin.gz"
 
+binaryExecutable: "rust-analyzer"
+
 mappingSettings:
   - languageId: "rust"
     fileType:

diff --git a/...cript-language-server/clientSettings.json → ...cript-language-server/clientSettings.json b/...cript-language-server/clientSettings.json → ...cript-language-server/clientSettings.json
diff --git a/.../typescript-language-server/settings.json → .../typescript-language-server/settings.json b/.../typescript-language-server/settings.json → .../typescript-language-server/settings.json
diff --git a/.../typescript-language-server/template.yaml → .../typescript-language-server/template.yaml b/.../typescript-language-server/template.yaml → .../typescript-language-server/template.yaml
@@ -21,5 +21,5 @@ mappingSettings:
       patterns: ["*.ts"]
   - languageId: typescriptreact
     fileType:
-      name: ypeScript-React
+      name: TypeScript-React
       patterns: ["*.tsx"]
diff --git a/...mplates/zig-language-server/template.yaml → ...mplates/zig-language-server/template.yaml b/...mplates/zig-language-server/template.yaml → ...mplates/zig-language-server/template.yaml
@@ -7,8 +7,8 @@ programArgs:
 
 binaryUrls:
   windows-x86_64: "https://github.com/zigtools/zls/releases/download/0.13.0/zls-x86_64-windows.zip"
-  unix-x86_64: "https://github.com/zigtools/zls/releases/download/0.13.0/zls-x86_64-linux.tar.xz"
-  unix-aarch64: "https://github.com/zigtools/zls/releases/download/0.13.0/zls-aarch64-linux.tar.xz"
+  linux-x86_64: "https://github.com/zigtools/zls/releases/download/0.13.0/zls-x86_64-linux.tar.xz"
+  lunix-aarch64: "https://github.com/zigtools/zls/releases/download/0.13.0/zls-aarch64-linux.tar.xz"
   mac-x86_64: "https://github.com/zigtools/zls/releases/download/0.13.0/zls-x86_64-macos.tar.xz"
   mac-aarch64: "https://github.com/zigtools/zls/releases/download/0.13.0/zls-aarch64-macos.tar.xz"
 

diff --git a/...ges/HulyLangConfiguratorBundle.properties → ...ges/HulyLangConfiguratorBundle.properties b/...ges/HulyLangConfiguratorBundle.properties → ...ges/HulyLangConfiguratorBundle.properties
diff --git a/...erverConfigSetupNotificationProvider.java → ...erverConfigSetupNotificationProvider.java b/...erverConfigSetupNotificationProvider.java → ...erverConfigSetupNotificationProvider.java
@@ -1,11 +1,14 @@
 // Copyright © 2024 HulyLabs. Use of this source code is governed by the Apache 2.0 license.
-package hulylabs.hulycode.plugins.hulylangconfigurator;
+package com.hulylabs.intellij.plugins.langconfigurator;
 
+import com.hulylabs.intellij.plugins.langconfigurator.templates.HulyLanguageServerTemplate;
+import com.hulylabs.intellij.plugins.langconfigurator.templates.HulyLanguageServerTemplateManager;
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.notification.NotificationGroup;
 import com.intellij.notification.NotificationGroupManager;
 import com.intellij.notification.NotificationType;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -15,16 +18,14 @@
 import com.intellij.ui.EditorNotificationProvider;
 import com.intellij.ui.EditorNotifications;
 import com.redhat.devtools.lsp4ij.LanguageServersRegistry;
-import hulylabs.hulycode.plugins.hulylangconfigurator.templates.HulyLanguageServerTemplate;
-import hulylabs.hulycode.plugins.hulylangconfigurator.templates.HulyLanguageServerTemplateManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.util.Locale;
 import java.util.function.Function;
 
-import static hulylabs.hulycode.plugins.hulylangconfigurator.messages.HulyLangConfiguratorBundle.message;
+import static com.hulylabs.intellij.plugins.langconfigurator.messages.HulyLangConfiguratorBundle.message;
 
 
 public class LanguageServerConfigSetupNotificationProvider implements EditorNotificationProvider {
@@ -35,7 +36,11 @@ public class LanguageServerConfigSetupNotificationProvider implements EditorNoti
                                                                                                                  @NotNull VirtualFile file) {
     String ext = file.getExtension() != null ? file.getExtension().toLowerCase(Locale.ROOT) : "";
     if (PropertiesComponent.getInstance(project).getBoolean(IGNORED_EXTS_KEY_PREFIX + ext)) return null;
-    HulyLanguageServerTemplate template = HulyLanguageServerTemplateManager.getInstance().getTemplate(project, file);
+
+    HulyLanguageServerTemplateManager manager = ApplicationManager.getApplication().getService(HulyLanguageServerTemplateManager.class);
+    if (manager == null) return null;
+
+    HulyLanguageServerTemplate template = manager.getTemplate(file);
     if (template == null) return null;
 
     if (LanguageServersRegistry.getInstance().isFileSupported(file, project)) return null;