Skip to content

Replacing JavaClassNames with CommonClassNames #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 1 commit into from
May 10, 2025
Merged

Replacing JavaClassNames with CommonClassNames #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions plugin/src/main/java/org/jetbrains/plugins/gradle/service/resolve/GradleResolverUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
import com.intellij.java.language.psi.*;
import consulo.annotation.access.RequiredReadAction;
import consulo.application.util.RecursionManager;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.psi.PsiElement;
import consulo.language.psi.resolve.PsiScopeProcessor;
import consulo.language.psi.resolve.ResolveState;
import consulo.language.psi.util.PsiTreeUtil;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import org.jetbrains.plugins.gradle.util.GradleLog;
import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
Expand All @@ -40,8 +41,6 @@
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyPropertyUtils;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import java.util.Arrays;

/**
Expand All @@ -66,6 +65,7 @@ public static int getGrMethodArumentsCount(@Nonnull GrArgumentList args) {
return argsCount;
}

@RequiredReadAction
public static void addImplicitVariable(
@Nonnull PsiScopeProcessor processor,
@Nonnull ResolveState state,
Expand Down Expand Up @@ -118,15 +118,15 @@ public static GrLightMethodBuilder createMethodWithClosure(
}
else {
PsiClassType closureClassTypeParameter =
factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_OBJECT, place.getResolveScope());
factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_OBJECT, place.getResolveScope());
closureType = factory.createType(closureClass, closureClassTypeParameter);
}

GrLightMethodBuilder methodWithClosure = new GrLightMethodBuilder(place.getManager(), name);
GrLightParameter closureParameter = new GrLightParameter("closure", closureType, methodWithClosure);
methodWithClosure.addParameter(closureParameter);
PsiClassType retType = factory.createTypeByFQClassName(
returnType != null ? returnType : JavaClassNames.JAVA_LANG_OBJECT,
returnType != null ? returnType : CommonClassNames.JAVA_LANG_OBJECT,
place.getResolveScope()
);
methodWithClosure.setReturnType(retType);
Expand Down Expand Up @@ -154,9 +154,9 @@ public static void processMethod(
) {
GrLightMethodBuilder builder = new GrLightMethodBuilder(place.getManager(), methodName);
PsiElementFactory factory = JavaPsiFacade.getElementFactory(place.getManager().getProject());
PsiType type = new PsiArrayType(factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_OBJECT, place.getResolveScope()));
PsiType type = new PsiArrayType(factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_OBJECT, place.getResolveScope()));
builder.addParameter(new GrLightParameter("param", type, builder));
PsiClassType retType = factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_OBJECT, place.getResolveScope());
PsiClassType retType = factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_OBJECT, place.getResolveScope());
builder.setReturnType(retType);
processor.execute(builder, state);

Expand Down
9 changes: 5 additions & 4 deletions plugin/src/main/java/org/jetbrains/plugins/gradle/service/resolve/GradleTaskContributor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@

import com.intellij.java.language.impl.psi.impl.source.PsiImmediateClassType;
import com.intellij.java.language.psi.*;
import consulo.annotation.access.RequiredReadAction;
import consulo.annotation.component.ExtensionImpl;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.psi.PsiElement;
import consulo.language.psi.resolve.PsiScopeProcessor;
import consulo.language.psi.resolve.ResolveState;
import consulo.language.psi.util.PsiTreeUtil;
import consulo.util.lang.StringUtil;
import jakarta.annotation.Nonnull;
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrNamedArgument;
Expand All @@ -35,7 +36,6 @@
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrLightMethodBuilder;
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrLightParameter;

import jakarta.annotation.Nonnull;
import java.util.List;

/**
Expand All @@ -45,6 +45,7 @@
@ExtensionImpl
public class GradleTaskContributor implements GradleMethodContextContributor {
@Override
@RequiredReadAction
public void process(
@Nonnull List<String> methodCallInfo,
@Nonnull PsiScopeProcessor processor,
Expand Down Expand Up @@ -140,9 +141,9 @@ private static void processTaskAddition(

GrLightMethodBuilder builder = new GrLightMethodBuilder(place.getManager(), name);
PsiElementFactory factory = JavaPsiFacade.getElementFactory(place.getManager().getProject());
PsiType type = new PsiArrayType(factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_OBJECT, place.getResolveScope()));
PsiType type = new PsiArrayType(factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_OBJECT, place.getResolveScope()));
builder.addParameter(new GrLightParameter("taskInfo", type, builder));
PsiClassType retType = factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_STRING, place.getResolveScope());
PsiClassType retType = factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_STRING, place.getResolveScope());
builder.setReturnType(retType);
processor.execute(builder, state);

Expand Down
Loading