falsepattern/ZigBrains
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

chore: Add todos to remove bypass once upstream fixes it

Browse source
This commit is contained in:
FalsePattern 2024-07-17 15:34:38 +02:00
parent c3cea6003a
commit c4c533eeb4
Signed by: falsepattern
GPG key ID: E930CDEC50C50E23
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/plugin/src/main/resources/META-INF/plugin.xml
View file

@ -32,6 +32,10 @@
<lang.formatter language="Zig" implementationClass="com.falsepattern.zigbrains.zig.formatter.ZigFormattingModelBuilder"/> <lang.formatter language="Zig" implementationClass="com.falsepattern.zigbrains.zig.formatter.ZigFormattingModelBuilder"/>
<!--
TODO remove these two once https://github.com/redhat-developer/lsp4ij/issues/424 is resolved
-->
<formattingService id = "ZigLSPFormattingOnlyServiceProxy" implementation="com.falsepattern.zigbrains.zig.formatter.ZigLSPFormattingOnlyServiceProxy"/> <formattingService id = "ZigLSPFormattingOnlyServiceProxy" implementation="com.falsepattern.zigbrains.zig.formatter.ZigLSPFormattingOnlyServiceProxy"/>
<formattingService id = "ZigLSPFormattingAndRangeBothServiceProxy" implementation="com.falsepattern.zigbrains.zig.formatter.ZigLSPFormattingAndRangeBothServiceProxy"/> <formattingService id = "ZigLSPFormattingAndRangeBothServiceProxy" implementation="com.falsepattern.zigbrains.zig.formatter.ZigLSPFormattingAndRangeBothServiceProxy"/>

3
modules/zig/src/main/java/com/falsepattern/zigbrains/zig/formatter/ZigAbstractLSPFormattingServiceProxy.java
View file

@ -18,6 +18,9 @@ import org.jetbrains.annotations.Nullable;
import java.util.Set; import java.util.Set;
/*
TODO remove once https://github.com/redhat-developer/lsp4ij/issues/424 is resolved
*/
public abstract class ZigAbstractLSPFormattingServiceProxy implements FormattingService { public abstract class ZigAbstractLSPFormattingServiceProxy implements FormattingService {
protected abstract AbstractLSPFormattingService getProxiedService(); protected abstract AbstractLSPFormattingService getProxiedService();
protected abstract boolean canSupportFormatting(@Nullable ServerCapabilities var1); protected abstract boolean canSupportFormatting(@Nullable ServerCapabilities var1);

11
modules/zig/src/main/java/com/falsepattern/zigbrains/zig/formatter/ZigLSPFormattingAndRangeBothServiceProxy.java
View file

@ -1,20 +1,15 @@
package com.falsepattern.zigbrains.zig.formatter; package com.falsepattern.zigbrains.zig.formatter;
import com.intellij.formatting.FormattingRangesInfo;
import com.intellij.formatting.service.FormattingService; import com.intellij.formatting.service.FormattingService;
import com.intellij.lang.ImportOptimizer;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.redhat.devtools.lsp4ij.LanguageServerItem; import com.redhat.devtools.lsp4ij.LanguageServerItem;
import com.redhat.devtools.lsp4ij.features.formatting.AbstractLSPFormattingService; import com.redhat.devtools.lsp4ij.features.formatting.AbstractLSPFormattingService;
import com.redhat.devtools.lsp4ij.features.formatting.LSPFormattingAndRangeBothService; import com.redhat.devtools.lsp4ij.features.formatting.LSPFormattingAndRangeBothService;
import org.eclipse.lsp4j.ServerCapabilities; import org.eclipse.lsp4j.ServerCapabilities;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Set; /*
TODO remove once https://github.com/redhat-developer/lsp4ij/issues/424 is resolved
*/
public class ZigLSPFormattingAndRangeBothServiceProxy extends ZigAbstractLSPFormattingServiceProxy { public class ZigLSPFormattingAndRangeBothServiceProxy extends ZigAbstractLSPFormattingServiceProxy {
@Override @Override
protected AbstractLSPFormattingService getProxiedService() { protected AbstractLSPFormattingService getProxiedService() {

4
modules/zig/src/main/java/com/falsepattern/zigbrains/zig/formatter/ZigLSPFormattingOnlyServiceProxy.java
View file

@ -3,11 +3,13 @@ package com.falsepattern.zigbrains.zig.formatter;
import com.intellij.formatting.service.FormattingService; import com.intellij.formatting.service.FormattingService;
import com.redhat.devtools.lsp4ij.LanguageServerItem; import com.redhat.devtools.lsp4ij.LanguageServerItem;
import com.redhat.devtools.lsp4ij.features.formatting.AbstractLSPFormattingService; import com.redhat.devtools.lsp4ij.features.formatting.AbstractLSPFormattingService;
import com.redhat.devtools.lsp4ij.features.formatting.LSPFormattingAndRangeBothService;
import com.redhat.devtools.lsp4ij.features.formatting.LSPFormattingOnlyService; import com.redhat.devtools.lsp4ij.features.formatting.LSPFormattingOnlyService;
import org.eclipse.lsp4j.ServerCapabilities; import org.eclipse.lsp4j.ServerCapabilities;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
/*
TODO remove once https://github.com/redhat-developer/lsp4ij/issues/424 is resolved
*/
public class ZigLSPFormattingOnlyServiceProxy extends ZigAbstractLSPFormattingServiceProxy { public class ZigLSPFormattingOnlyServiceProxy extends ZigAbstractLSPFormattingServiceProxy {
@Override @Override
protected AbstractLSPFormattingService getProxiedService() { protected AbstractLSPFormattingService getProxiedService() {