chore: The flattening

build.gradle.kts

@@ -187,6 +187,7 @@ project(":debugger") {
         implementation(project(":project"))
         implementation(project(":common"))
         implementation(project(":lsp-common"))
+        implementation(project(":lsp"))
         implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.22.0")
     }
     intellij {

modules/debugger/src/main/java/com/falsepattern/zigbrains/cpp/CPPDebuggerDriverProvider.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.cpp;
+package com.falsepattern.zigbrains.cpp;
 
-import com.falsepattern.zigbrains.zig.debugbridge.DebuggerDriverProvider;
+import com.falsepattern.zigbrains.debugbridge.DebuggerDriverProvider;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.jetbrains.cidr.cpp.execution.debugger.backend.CLionGDBDriverConfiguration;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugbridge/DebuggerDriverProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugbridge;
+package com.falsepattern.zigbrains.debugbridge;
 
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/Utils.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger;
+package com.falsepattern.zigbrains.debugger;
 
-import com.falsepattern.zigbrains.zig.debugbridge.DebuggerDriverProvider;
+import com.falsepattern.zigbrains.debugbridge.DebuggerDriverProvider;
-import com.falsepattern.zigbrains.zig.debugger.win.WinDebuggerDriverConfiguration;
+import com.falsepattern.zigbrains.debugger.win.WinDebuggerDriverConfiguration;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/ZigDebuggerEditorsExtension.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger;
+package com.falsepattern.zigbrains.debugger;
 
 import com.jetbrains.cidr.execution.debugger.CidrDebuggerEditorsExtensionBase;
 

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/ZigDebuggerLanguage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger;
+package com.falsepattern.zigbrains.debugger;
 
 import com.jetbrains.cidr.execution.debugger.backend.DebuggerDriver;
 import lombok.AccessLevel;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/ZigDebuggerLanguageSupport.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger;
+package com.falsepattern.zigbrains.debugger;
 
 import com.falsepattern.zigbrains.project.execution.base.ZigExecConfigBase;
 import com.intellij.execution.configurations.RunProfile;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/ZigLineBreakpointFileTypesProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger;
+package com.falsepattern.zigbrains.debugger;
 
 import com.falsepattern.zigbrains.zig.ZigFileType;
 import com.intellij.openapi.fileTypes.FileType;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/ZigLocalDebugProcess.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger;
+package com.falsepattern.zigbrains.debugger;
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.filters.Filter;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/dap/BlockingPipedInputStream.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.dap;
+package com.falsepattern.zigbrains.debugger.dap;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/dap/DAPDebuggerDriverConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.dap;
+package com.falsepattern.zigbrains.debugger.dap;
 
 import com.falsepattern.zigbrains.zig.ZigLanguage;
 import com.intellij.execution.ExecutionException;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/dap/DAPDriver.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.dap;
+package com.falsepattern.zigbrains.debugger.dap;
 
 import com.falsepattern.zigbrains.project.runconfig.ZigProcessHandler;
 import com.intellij.execution.ExecutionException;
@@ -126,8 +126,6 @@ import java.util.concurrent.Executors;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static com.falsepattern.zigbrains.zig.debugger.dap.Util.emptyIfNull;
-
 public abstract class DAPDriver<
         Server extends IDebugProtocolServer,
         ServerWrapper extends WrappedDebugServer<Server>,
@@ -836,10 +834,10 @@ public abstract class DAPDriver<
         val variables = server.variablesNow(variableArgs);
         for (val variable : variables.getVariables()) {
             val address = Util.parseAddressNullable(variable.getMemoryReference());
-            val type = emptyIfNull(variable.getType());
+            val type = Util.emptyIfNull(variable.getType());
             val truncated = type.replaceAll("error\\{.*?}", "error{}");
             val name = variable.getName();
-            val evalName = emptyIfNull(variable.getEvaluateName());
+            val evalName = Util.emptyIfNull(variable.getEvaluateName());
             val childRef = variable.getVariablesReference();
             val knownValue = variable.getValue();
 

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/dap/Util.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.dap;
+package com.falsepattern.zigbrains.debugger.dap;
 
 import com.falsepattern.zigbrains.common.util.ApplicationUtil;
-import com.falsepattern.zigbrains.zig.debugger.ZigDebuggerLanguage;
+import com.falsepattern.zigbrains.debugger.ZigDebuggerLanguage;
 import com.intellij.execution.ExecutionException;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFileUtil;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/dap/WrappedDebugServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.dap;
+package com.falsepattern.zigbrains.debugger.dap;
 
 import com.intellij.execution.ExecutionException;
 import lombok.RequiredArgsConstructor;
@@ -89,7 +89,7 @@ import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-import static com.falsepattern.zigbrains.zig.debugger.dap.Util.get;
+import static com.falsepattern.zigbrains.debugger.dap.Util.get;
 
 @SuppressWarnings("unused")
 @RequiredArgsConstructor

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/base/ZigDebugEmitBinaryInstaller.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.base;
+package com.falsepattern.zigbrains.debugger.runner.base;
 
 import com.falsepattern.zigbrains.project.execution.base.ProfileStateBase;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/base/ZigDebugParametersBase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.base;
+package com.falsepattern.zigbrains.debugger.runner.base;
 
 import com.falsepattern.zigbrains.project.execution.base.ProfileStateBase;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/base/ZigDebugRunnerBase.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.base;
+package com.falsepattern.zigbrains.debugger.runner.base;
 
 import com.falsepattern.zigbrains.project.execution.base.ProfileStateBase;
 import com.falsepattern.zigbrains.project.runconfig.ZigProgramRunnerBase;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;
-import com.falsepattern.zigbrains.zig.debugger.Utils;
+import com.falsepattern.zigbrains.debugger.Utils;
-import com.falsepattern.zigbrains.zig.debugger.ZigLocalDebugProcess;
+import com.falsepattern.zigbrains.debugger.ZigLocalDebugProcess;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.executors.DefaultDebugExecutor;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/binary/ZigDebugParametersBinary.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.binary;
+package com.falsepattern.zigbrains.debugger.runner.binary;
 
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugParametersBase;
 import com.falsepattern.zigbrains.project.execution.binary.ProfileStateBinary;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugParametersBase;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.jetbrains.cidr.execution.Installer;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/binary/ZigDebugRunnerBinary.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.binary;
+package com.falsepattern.zigbrains.debugger.runner.binary;
 
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugParametersBase;
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugRunnerBase;
 import com.falsepattern.zigbrains.project.execution.base.ProfileStateBase;
 import com.falsepattern.zigbrains.project.execution.binary.ProfileStateBinary;
 import com.falsepattern.zigbrains.project.execution.binary.ZigExecConfigBinary;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;
 import com.falsepattern.zigbrains.project.toolchain.LocalZigToolchain;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugParametersBase;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugRunnerBase;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.notification.Notification;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/build/ZigDebugParametersBuild.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.build;
+package com.falsepattern.zigbrains.debugger.runner.build;
 
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugParametersBase;
 import com.falsepattern.zigbrains.project.execution.build.ProfileStateBuild;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;
 import com.falsepattern.zigbrains.project.util.CLIUtil;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugParametersBase;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.jetbrains.cidr.execution.Installer;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/build/ZigDebugRunnerBuild.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.build;
+package com.falsepattern.zigbrains.debugger.runner.build;
 
 import com.falsepattern.zigbrains.project.execution.base.ProfileStateBase;
 import com.falsepattern.zigbrains.project.execution.build.ProfileStateBuild;
 import com.falsepattern.zigbrains.project.execution.build.ZigExecConfigBuild;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;
 import com.falsepattern.zigbrains.project.toolchain.LocalZigToolchain;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugParametersBase;
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugParametersBase;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugRunnerBase;
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugRunnerBase;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.notification.Notification;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/run/ZigDebugParametersRun.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.run;
+package com.falsepattern.zigbrains.debugger.runner.run;
 
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugEmitBinaryInstaller;
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugParametersBase;
 import com.falsepattern.zigbrains.project.execution.run.ProfileStateRun;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugEmitBinaryInstaller;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugParametersBase;
 import com.jetbrains.cidr.execution.Installer;
 import com.jetbrains.cidr.execution.debugger.backend.DebuggerDriverConfiguration;
 import org.jetbrains.annotations.NotNull;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/run/ZigDebugRunnerRun.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.run;
+package com.falsepattern.zigbrains.debugger.runner.run;
 
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugRunnerBase;
 import com.falsepattern.zigbrains.project.execution.base.ProfileStateBase;
 import com.falsepattern.zigbrains.project.execution.run.ProfileStateRun;
 import com.falsepattern.zigbrains.project.execution.run.ZigExecConfigRun;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;
 import com.falsepattern.zigbrains.project.toolchain.LocalZigToolchain;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugRunnerBase;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.notification.Notification;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/test/ZigDebugParametersTest.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.test;
+package com.falsepattern.zigbrains.debugger.runner.test;
 
 import com.falsepattern.zigbrains.project.execution.test.ProfileStateTest;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugEmitBinaryInstaller;
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugEmitBinaryInstaller;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugParametersBase;
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugParametersBase;
 import com.jetbrains.cidr.execution.Installer;
 import com.jetbrains.cidr.execution.debugger.backend.DebuggerDriverConfiguration;
 import org.jetbrains.annotations.NotNull;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/runner/test/ZigDebugRunnerTest.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.runner.test;
+package com.falsepattern.zigbrains.debugger.runner.test;
 
 import com.falsepattern.zigbrains.project.execution.base.ProfileStateBase;
 import com.falsepattern.zigbrains.project.execution.test.ProfileStateTest;
 import com.falsepattern.zigbrains.project.execution.test.ZigExecConfigTest;
 import com.falsepattern.zigbrains.project.toolchain.AbstractZigToolchain;
 import com.falsepattern.zigbrains.project.toolchain.LocalZigToolchain;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugParametersBase;
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugParametersBase;
-import com.falsepattern.zigbrains.zig.debugger.runner.base.ZigDebugRunnerBase;
+import com.falsepattern.zigbrains.debugger.runner.base.ZigDebugRunnerBase;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.notification.Notification;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/win/WinDAPDriver.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.win;
+package com.falsepattern.zigbrains.debugger.win;
 
-import com.falsepattern.zigbrains.zig.debugger.dap.DAPDriver;
+import com.falsepattern.zigbrains.debugger.dap.DAPDriver;
-import com.falsepattern.zigbrains.zig.debugger.dap.WrappedDebugServer;
+import com.falsepattern.zigbrains.debugger.dap.WrappedDebugServer;
 import com.intellij.execution.ExecutionException;
 import com.intellij.util.system.CpuArch;
 import com.jetbrains.cidr.ArchitectureType;
@@ -46,8 +46,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.zip.Inflater;
 
 public class WinDAPDriver extends DAPDriver<
-        IDebugProtocolServer,
+        IDebugProtocolServer, WrappedDebugServer<IDebugProtocolServer>,
-        WrappedDebugServer<IDebugProtocolServer>,
         WinDAPDriver.WinDAPDebuggerClient
         > {
     private final CompletableFuture<HandshakeResponse> handshakeFuture = new CompletableFuture<>();

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/win/WinDebuggerDriverConfiguration.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.win;
+package com.falsepattern.zigbrains.debugger.win;
 
-import com.falsepattern.zigbrains.zig.debugger.dap.DAPDebuggerDriverConfiguration;
+import com.falsepattern.zigbrains.debugger.dap.DAPDebuggerDriverConfiguration;
-import com.falsepattern.zigbrains.zig.debugger.win.config.WinDebuggerConfigService;
+import com.falsepattern.zigbrains.debugger.win.config.WinDebuggerConfigService;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.jetbrains.cidr.ArchitectureType;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/win/config/WinDebuggerConfigService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.win.config;
+package com.falsepattern.zigbrains.debugger.win.config;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/win/config/WinDebuggerConfigurable.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.win.config;
+package com.falsepattern.zigbrains.debugger.win.config;
 
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;

modules/debugger/src/main/java/com/falsepattern/zigbrains/debugger/win/config/WinDebuggerSettingsPanel.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.falsepattern.zigbrains.zig.debugger.win.config;
+package com.falsepattern.zigbrains.debugger.win.config;
 
 import com.falsepattern.zigbrains.common.util.StringUtil;
 import com.falsepattern.zigbrains.common.util.TextFieldUtil;

modules/debugger/src/main/resources/META-INF/zigbrains-zig-cpp.xml

@@ -14,10 +14,10 @@
   ~ limitations under the License.
   -->
 
-<idea-plugin package="com.falsepattern.zigbrains.zig.cpp">
+<idea-plugin package="com.falsepattern.zigbrains.cpp">
     <depends>com.intellij.modules.clion</depends>
     <extensions defaultExtensionNs="com.falsepattern.zigbrains">
-        <debuggerDriverProvider implementation="com.falsepattern.zigbrains.zig.cpp.CPPDebuggerDriverProvider"/>
+        <debuggerDriverProvider implementation="com.falsepattern.zigbrains.cpp.CPPDebuggerDriverProvider"/>
     </extensions>
 
 </idea-plugin>

modules/debugger/src/main/resources/META-INF/zigbrains-zig-debugger.xml

@@ -14,36 +14,36 @@
   ~ limitations under the License.
   -->
 
-<idea-plugin package="com.falsepattern.zigbrains.zig.debugger">
+<idea-plugin package="com.falsepattern.zigbrains.debugger">
     <depends>com.intellij.modules.cidr.debugger</depends>
-    <resource-bundle>zigbrains.zig.debugger.Bundle</resource-bundle>
+    <resource-bundle>zigbrains.debugger.Bundle</resource-bundle>
 
     <extensions defaultExtensionNs="com.intellij">
-        <programRunner implementation="com.falsepattern.zigbrains.zig.debugger.runner.run.ZigDebugRunnerRun"
+        <programRunner implementation="com.falsepattern.zigbrains.debugger.runner.run.ZigDebugRunnerRun"
                        id="ZigDebugRunnerRun"/>
-        <programRunner implementation="com.falsepattern.zigbrains.zig.debugger.runner.test.ZigDebugRunnerTest"
+        <programRunner implementation="com.falsepattern.zigbrains.debugger.runner.test.ZigDebugRunnerTest"
                        id="ZigDebugRunnerTest"/>
-        <programRunner implementation="com.falsepattern.zigbrains.zig.debugger.runner.build.ZigDebugRunnerBuild"
+        <programRunner implementation="com.falsepattern.zigbrains.debugger.runner.build.ZigDebugRunnerBuild"
                        id="ZigDebugRunnerBuild"/>
-        <programRunner implementation="com.falsepattern.zigbrains.zig.debugger.runner.binary.ZigDebugRunnerBinary"
+        <programRunner implementation="com.falsepattern.zigbrains.debugger.runner.binary.ZigDebugRunnerBinary"
                        id="ZigDebugRunnerBinary"/>
 
         <notificationGroup displayType="BALLOON"
-                           bundle="zigbrains.zig.debugger.Bundle"
+                           bundle="zigbrains.debugger.Bundle"
                            key="notif-debug-error"
                            id="ZigBrains.Debugger.Error"/>
         <notificationGroup displayType="BALLOON"
-                           bundle="zigbrains.zig.debugger.Bundle"
+                           bundle="zigbrains.debugger.Bundle"
                            key="notif-debug-warn"
                            id="ZigBrains.Debugger.Warn"/>
         <applicationConfigurable parentId="project.propDebugger"
-                                 instance="com.falsepattern.zigbrains.zig.debugger.win.config.WinDebuggerConfigurable"
+                                 instance="com.falsepattern.zigbrains.debugger.win.config.WinDebuggerConfigurable"
                                  displayName="Zig (Windows)"/>
     </extensions>
 
     <extensions defaultExtensionNs="cidr.debugger">
-        <languageSupport language="Zig" implementationClass="com.falsepattern.zigbrains.zig.debugger.ZigDebuggerLanguageSupport"/>
+        <languageSupport language="Zig" implementationClass="com.falsepattern.zigbrains.debugger.ZigDebuggerLanguageSupport"/>
-        <editorsExtension language="Zig" implementationClass="com.falsepattern.zigbrains.zig.debugger.ZigDebuggerEditorsExtension"/>
+        <editorsExtension language="Zig" implementationClass="com.falsepattern.zigbrains.debugger.ZigDebuggerEditorsExtension"/>
-        <lineBreakpointFileTypesProvider implementation="com.falsepattern.zigbrains.zig.debugger.ZigLineBreakpointFileTypesProvider"/>
+        <lineBreakpointFileTypesProvider implementation="com.falsepattern.zigbrains.debugger.ZigLineBreakpointFileTypesProvider"/>
     </extensions>
 </idea-plugin>

modules/lsp-common/src/main/java/com/falsepattern/zigbrains/lspcommon/connection/ProcessStreamConnectionProvider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.falsepattern.zigbrains.lsp.common.connection;
+package com.falsepattern.zigbrains.lspcommon.connection;
 
 import com.intellij.openapi.diagnostic.Logger;
 import org.jetbrains.annotations.NotNull;

modules/lsp-common/src/main/java/com/falsepattern/zigbrains/lspcommon/connection/StreamConnectionProvider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.falsepattern.zigbrains.lsp.common.connection;
+package com.falsepattern.zigbrains.lspcommon.connection;
 
 import javax.annotation.Nullable;
 import java.io.IOException;

modules/lsp/src/main/java/com/falsepattern/zigbrains/lsp/client/languageserver/serverdefinition/LanguageServerDefinition.java

@@ -15,7 +15,7 @@
  */
 package com.falsepattern.zigbrains.lsp.client.languageserver.serverdefinition;
 
-import com.falsepattern.zigbrains.lsp.common.connection.StreamConnectionProvider;
+import com.falsepattern.zigbrains.lspcommon.connection.StreamConnectionProvider;
 import com.intellij.openapi.diagnostic.Logger;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;

modules/lsp/src/main/java/com/falsepattern/zigbrains/lsp/client/languageserver/serverdefinition/ProcessBuilderServerDefinition.java

@@ -15,8 +15,8 @@
  */
 package com.falsepattern.zigbrains.lsp.client.languageserver.serverdefinition;
 
-import com.falsepattern.zigbrains.lsp.common.connection.ProcessStreamConnectionProvider;
+import com.falsepattern.zigbrains.lspcommon.connection.ProcessStreamConnectionProvider;
-import com.falsepattern.zigbrains.lsp.common.connection.StreamConnectionProvider;
+import com.falsepattern.zigbrains.lspcommon.connection.StreamConnectionProvider;
 
 import java.util.Collections;
 import java.util.Map;

modules/lsp/src/main/java/com/falsepattern/zigbrains/lsp/client/languageserver/serverdefinition/RawCommandServerDefinition.java

@@ -15,8 +15,8 @@
  */
 package com.falsepattern.zigbrains.lsp.client.languageserver.serverdefinition;
 
-import com.falsepattern.zigbrains.lsp.common.connection.ProcessStreamConnectionProvider;
+import com.falsepattern.zigbrains.lspcommon.connection.ProcessStreamConnectionProvider;
-import com.falsepattern.zigbrains.lsp.common.connection.StreamConnectionProvider;
+import com.falsepattern.zigbrains.lspcommon.connection.StreamConnectionProvider;
 
 import java.util.Arrays;
 import java.util.Collections;

plugin/src/main/resources/META-INF/plugin.xml

@@ -9,12 +9,10 @@
     <xi:include href="/META-INF/zigbrains-zig.xml"/>
     <xi:include href="/META-INF/zigbrains-zon.xml"/>
     <xi:include href="/META-INF/zigbrains-project.xml"/>
-    <!--suppress PluginXmlValidity -->
     <depends optional="true" config-file="zigbrains-zig-debugger.xml">com.intellij.modules.cidr.debugger</depends>
     <depends optional="true" config-file="zigbrains-zig-cpp.xml">com.intellij.modules.clion</depends>
 
     <extensionPoints>
-        <!-- region zigbrains-project -->
         <extensionPoint
                 interface="com.falsepattern.zigbrains.project.toolchain.flavours.AbstractZigToolchainFlavour" dynamic="true"
                 name="toolchainFlavour"/>
@@ -25,8 +23,7 @@
                 interface="com.falsepattern.zigbrains.zig.environment.ZLSConfigProvider" dynamic="true"
                 name="zlsConfigProvider"/>
         <extensionPoint
-                interface="com.falsepattern.zigbrains.zig.debugbridge.DebuggerDriverProvider" dynamic="true"
+                interface="com.falsepattern.zigbrains.debugbridge.DebuggerDriverProvider" dynamic="true"
                 name="debuggerDriverProvider"/>
-        <!-- endregion zigbrains-project -->
     </extensionPoints>
 </idea-plugin>