Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions api/src/main/java/net/neoforged/jst/api/FileSink.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package net.neoforged.jst.api;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.attribute.FileTime;

public interface FileSink extends AutoCloseable {
Expand Down
1 change: 0 additions & 1 deletion api/src/main/java/net/neoforged/jst/api/PsiHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifier;
import com.intellij.psi.PsiParameter;
Expand Down
1 change: 0 additions & 1 deletion api/src/main/java/net/neoforged/jst/api/Replacement.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package net.neoforged.jst.api;

import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;

import java.util.Comparator;

Expand Down
1 change: 0 additions & 1 deletion api/src/main/java/net/neoforged/jst/api/Replacements.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.intellij.psi.PsiElement;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

public final class Replacements {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.neoforged.jst.cli.intellij;

import com.intellij.codeInsight.ExternalAnnotationsManager;
import com.intellij.core.CoreApplicationEnvironment;
import com.intellij.core.JavaCoreApplicationEnvironment;
import com.intellij.core.JavaCoreProjectEnvironment;
Expand Down Expand Up @@ -153,6 +154,7 @@ public PsiFile parseFileFromMemory(String filename, String fileContent) {
*/
private void initProjectExtensionsAndServices(MockProject project) {
project.registerService(PsiNameHelper.class, PsiNameHelperImpl.class);
project.registerService(ExternalAnnotationsManager.class, new MockExternalAnnotationsManager());

var projectExtensions = project.getExtensionArea();
CoreApplicationEnvironment.registerExtensionPoint(projectExtensions, PsiTreeChangePreprocessor.EP.getName(), PsiTreeChangePreprocessor.class);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
package net.neoforged.jst.cli.intellij;

import com.intellij.codeInsight.ExternalAnnotationsManager;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiAnnotation;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiModifierListOwner;
import com.intellij.psi.PsiNameValuePair;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.List;

public class MockExternalAnnotationsManager extends ExternalAnnotationsManager {
@Override
public boolean hasAnnotationRootsForFile(@NotNull VirtualFile file) {
return false;
}

@Override
public boolean isExternalAnnotation(@NotNull PsiAnnotation annotation) {
return false;
}

@Override
public @Nullable PsiAnnotation findExternalAnnotation(@NotNull PsiModifierListOwner listOwner, @NotNull String annotationFQN) {
return null;
}

@Override
public @NotNull List<PsiAnnotation> findExternalAnnotations(@NotNull PsiModifierListOwner listOwner, @NotNull String annotationFQN) {
return List.of();
}

@Override
public boolean isExternalAnnotationWritable(@NotNull PsiModifierListOwner listOwner, @NotNull String annotationFQN) {
return false;
}

@Override
public @NotNull PsiAnnotation @NotNull [] findExternalAnnotations(@NotNull PsiModifierListOwner listOwner) {
return new PsiAnnotation[0];
}

@Override
public @Nullable List<PsiAnnotation> findDefaultConstructorExternalAnnotations(@NotNull PsiClass aClass) {
return List.of();
}

@Override
public @Nullable List<PsiAnnotation> findDefaultConstructorExternalAnnotations(@NotNull PsiClass aClass, @NotNull String annotationFQN) {
return List.of();
}

@Override
public void annotateExternally(@NotNull PsiModifierListOwner listOwner, @NotNull String annotationFQName, @NotNull PsiFile fromFile, PsiNameValuePair @Nullable [] value) throws CanceledConfigurationException {

}

@Override
public boolean deannotate(@NotNull PsiModifierListOwner listOwner, @NotNull String annotationFQN) {
return false;
}

@Override
public boolean editExternalAnnotation(@NotNull PsiModifierListOwner listOwner, @NotNull String annotationFQN, PsiNameValuePair @Nullable [] value) {
return false;
}

@Override
public @NotNull AnnotationPlace chooseAnnotationsPlaceNoUi(@NotNull PsiElement element) {
return AnnotationPlace.NOWHERE;
}

@Override
public @NotNull AnnotationPlace chooseAnnotationsPlace(@NotNull PsiElement element) {
return AnnotationPlace.NOWHERE;
}

@Override
public @Nullable List<PsiFile> findExternalAnnotationsFiles(@NotNull PsiModifierListOwner listOwner) {
return List.of();
}

@Override
public boolean hasConfiguredAnnotationRoot(@NotNull PsiModifierListOwner owner) {
return false;
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package net.neoforged.jst.cli.io;

import net.neoforged.jst.api.FileSink;
import net.neoforged.jst.api.SourceTransformer;

import java.io.IOException;
import java.nio.file.Files;
Expand Down
3 changes: 0 additions & 3 deletions cli/src/test/java/net/neoforged/jst/cli/ImportHelperTest.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package net.neoforged.jst.cli;

import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiJavaFile;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.util.PsiTreeUtil;
import net.neoforged.jst.api.ImportHelper;
import net.neoforged.jst.api.Logger;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.intellij.psi.javadoc.PsiDocComment;
import com.intellij.psi.javadoc.PsiDocToken;
import net.neoforged.jst.api.PsiHelper;
import net.neoforged.jst.api.Replacement;
import net.neoforged.jst.api.Replacements;
import org.jetbrains.annotations.Nullable;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import net.neoforged.jst.parchment.namesanddocs.srgutils.MappingFileDatabase;
import net.neoforged.jst.parchment.namesanddocs.parchment.ParchmentDatabase;
import net.neoforged.srgutils.INamedMappingFile;
import org.jetbrains.annotations.Nullable;

import java.io.IOException;
Expand Down
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ include 'tests'
include 'accesstransformers'
include 'interfaceinjection'
include 'unpick'
include 'sourcetest'
11 changes: 11 additions & 0 deletions sourcetest/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* This project only serves to run the application with all plugins from IntelliJ
* while being able to step into original sources.
*/
dependencies {
implementation(project(':cli'))
implementation(project(':accesstransformers'))
implementation(project(':interfaceinjection'))
implementation(project(':parchment'))
implementation(project(':unpick'))
}
Loading