Skip to content

Upgrade to new scala plugin #23

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to new scala plugin #23

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
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

plugins {
id 'org.jetbrains.intellij' version '0.4.10'
id 'org.jetbrains.intellij' version '0.4.21'
id 'net.saliman.cobertura' version '2.6.1'
}

Expand All @@ -20,7 +20,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8

wrapper {
gradleVersion = '2.12'
gradleVersion = '6.6'
}

repositories {
Expand All @@ -30,8 +30,8 @@ repositories {

intellij {
pluginName 'IdeaConcordionSupport'
plugins = ['junit', 'properties', 'Groovy', 'org.intellij.scala:2017.2.6', 'git4idea']
version '2017.2'
plugins = ['junit', 'properties', 'Groovy', 'org.intellij.scala:2020.1.41', 'git4idea', 'java']
version '2020.1'
// sandboxDirectory "$projectDir/idea-sandbox"
downloadSources false
updateSinceUntilBuild false
Expand Down
24 changes: 15 additions & 9 deletions src/org/concordion/plugin/idea/ConcordionPsiUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,38 @@
import com.intellij.ide.highlighter.HtmlFileType;
import com.intellij.ide.highlighter.XHtmlFileType;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.xml.XmlAttribute;
import org.concordion.plugin.idea.lang.ConcordionFileType;
import org.concordion.plugin.idea.lang.psi.*;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.*;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Supplier;

import static com.intellij.psi.PsiModifier.*;
import static com.intellij.psi.util.PsiTreeUtil.*;
import static java.lang.Character.*;
import static java.util.Arrays.*;
import static com.intellij.psi.PsiModifier.PUBLIC;
import static com.intellij.psi.PsiModifier.STATIC;
import static com.intellij.psi.util.PsiTreeUtil.findChildOfType;
import static com.intellij.psi.util.PsiTreeUtil.getParentOfType;
import static java.lang.Character.isUpperCase;
import static java.lang.Character.toUpperCase;
import static java.util.Arrays.stream;
import static java.util.Optional.ofNullable;
import static java.util.stream.Collectors.*;
import static org.concordion.plugin.idea.ConcordionCommand.*;
import static java.util.stream.Collectors.toList;
import static org.concordion.plugin.idea.ConcordionCommand.ASSERT_EQUALS_SPINAL;
import static org.concordion.plugin.idea.ConcordionPsiTypeUtils.*;

public final class ConcordionPsiUtils {

private ConcordionPsiUtils() {
}

public static final PsiType DYNAMIC = new PsiPrimitiveType("?", new PsiAnnotation[0]);
public static final PsiType DYNAMIC = PsiType.NULL;

@NotNull
public static List<PsiType> typeOfExpressions(@NotNull List<ConcordionOgnlExpressionStart> starts) {
Expand Down
8 changes: 4 additions & 4 deletions src/org/concordion/plugin/idea/fixtures/ConcordionScalaTestFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
import org.concordion.plugin.idea.action.quickfix.factories.ScalaFixtureMemberFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.scala.lang.psi.api.base.ScStableCodeReferenceElement;
import org.jetbrains.plugins.scala.lang.psi.api.base.ScStableCodeReference;
import org.jetbrains.plugins.scala.lang.psi.api.expr.ScArgumentExprList;

import static com.intellij.psi.util.PsiTreeUtil.*;

public class ConcordionScalaTestFixture extends AbstractConcordionTestFixture<ScStableCodeReferenceElement> {
public class ConcordionScalaTestFixture extends AbstractConcordionTestFixture<ScStableCodeReference> {

public ConcordionScalaTestFixture() {
super(Language.findLanguageByID("Scala"), "scala", ScStableCodeReferenceElement.class, new ScalaFixtureMemberFactory());
super(Language.findLanguageByID("Scala"), "scala", ScStableCodeReference.class, new ScalaFixtureMemberFactory());
}

@Nullable
@Override
protected String qualifiedReference(@NotNull ScStableCodeReferenceElement codeReference) {
protected String qualifiedReference(@NotNull ScStableCodeReference codeReference) {
return codeReference.getCanonicalText();
}

Expand Down
19 changes: 5 additions & 14 deletions src/org/concordion/plugin/idea/marker/AbstractLineMarkerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.concordion.plugin.idea.marker;

import com.intellij.codeHighlighting.Pass;
import com.intellij.codeInsight.daemon.LineMarkerInfo;
import com.intellij.codeInsight.daemon.LineMarkerProvider;
import com.intellij.openapi.editor.markup.GutterIconRenderer;
import com.intellij.openapi.util.Key;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ProcessingContext;
import org.concordion.plugin.idea.ConcordionNavigationService;
import org.concordion.plugin.idea.lang.ConcordionIcons;
Expand All @@ -15,8 +15,6 @@
import org.jetbrains.annotations.Nullable;

import java.awt.event.MouseEvent;
import java.util.Collection;
import java.util.List;

public abstract class AbstractLineMarkerProvider implements LineMarkerProvider {

Expand Down Expand Up @@ -47,22 +45,15 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) {
return null;
}

@Override
public void collectSlowLineMarkers(@NotNull List<PsiElement> elements, @NotNull Collection<LineMarkerInfo> result) {

}

@NotNull
private static LineMarkerInfo<PsiElement> concordionFileInfoFor(@NotNull PsiElement element) {
PsiElement leaf = PsiTreeUtil.firstChild(element);
return new LineMarkerInfo<>(
element,
element.getTextRange(),
leaf,
leaf.getTextRange(),
ConcordionIcons.ICON,
Pass.UPDATE_ALL,
AbstractLineMarkerProvider::generateTooltipForConcordionFile,
AbstractLineMarkerProvider::navigateToPairedFile,
GutterIconRenderer.Alignment.CENTER
);
GutterIconRenderer.Alignment.CENTER);
}

@NotNull
Expand Down
8 changes: 0 additions & 8 deletions src/org/concordion/plugin/idea/marker/ExampleLineMarkerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Collection;
import java.util.List;

import static org.concordion.plugin.idea.lang.psi.ConcordionTypes.EXAMPLE_NAME;
import static org.concordion.plugin.idea.patterns.ConcordionPatterns.concordionElement;

Expand Down Expand Up @@ -62,11 +59,6 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) {
return null;
}

@Override
public void collectSlowLineMarkers(@NotNull List<PsiElement> list, @NotNull Collection<LineMarkerInfo> collection) {

}

@NotNull
private LineMarkerInfo<PsiElement> exampleInfoFor(@NotNull PsiElement element) {
return new LineMarkerInfo<>(
Expand Down
20 changes: 10 additions & 10 deletions tests/org/concordion/plugin/idea/ConcordionCodeInsightFixtureTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private static Void copyTemplate(@NotNull File sourceFile, @NotNull VirtualFile
protected void setUp() throws Exception {
super.setUp();

VirtualFile[] sourceRoots = ModuleRootManager.getInstance(myModule).getSourceRoots();
VirtualFile[] sourceRoots = ModuleRootManager.getInstance(myFixture.getModule()).getSourceRoots();
if (sourceRoots.length == 1) {
VirtualFile root = sourceRoots[0];
Ref<VirtualFile> src = new Ref<>();
Expand All @@ -102,20 +102,20 @@ protected void setUp() throws Exception {
return null;
});

PsiTestUtil.removeSourceRoot(myModule, root);
PsiTestUtil.addSourceRoot(myModule, src.get(), JavaSourceRootType.TEST_SOURCE);
PsiTestUtil.addSourceRoot(myModule, resources.get(), JavaResourceRootType.TEST_RESOURCE);
PsiTestUtil.removeSourceRoot(myFixture.getModule(), root);
PsiTestUtil.addSourceRoot(myFixture.getModule(), src.get(), JavaSourceRootType.TEST_SOURCE);
PsiTestUtil.addSourceRoot(myFixture.getModule(), resources.get(), JavaResourceRootType.TEST_RESOURCE);

//JDK
PsiTestUtil.addLibrary(myModule, "testData/lib/rt.jar");
PsiTestUtil.addLibrary(myFixture.getModule(), "testData/lib/rt.jar");
//Concordion dependencies
PsiTestUtil.addLibrary(myModule, "testData/lib/junit-4.12.jar");
PsiTestUtil.addLibrary(myFixture.getModule(), "testData/lib/junit-4.12.jar");
//Concordion itself
PsiTestUtil.addLibrary(myModule, "testData/lib/concordion-2.0.0.jar");
PsiTestUtil.addLibrary(myFixture.getModule(), "testData/lib/concordion-2.0.0.jar");
//Concordion extensions
PsiTestUtil.addLibrary(myModule, "testData/lib/concordion-embed-extension-1.1.2.jar");
PsiTestUtil.addLibrary(myModule, "testData/lib/concordion-executeonlyif-extension-0.2.1.jar");
PsiTestUtil.addLibrary(myModule, "testData/lib/concordion-screenshot-extension-1.2.0.jar");
PsiTestUtil.addLibrary(myFixture.getModule(), "testData/lib/concordion-embed-extension-1.1.2.jar");
PsiTestUtil.addLibrary(myFixture.getModule(), "testData/lib/concordion-executeonlyif-extension-0.2.1.jar");
PsiTestUtil.addLibrary(myFixture.getModule(), "testData/lib/concordion-screenshot-extension-1.2.0.jar");
}
}

Expand Down