Merge branch 'ignatov:master' into master

ssvip9527 · web-flow · commit 6f8fcb48907b · 2022-11-22T21:11:24.000+08:00
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -9,9 +9,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Build with Gradle
       run: ./gradlew clean test
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -1,21 +1,21 @@
 plugins {
-  id 'org.jetbrains.intellij' version "1.8.0"
+  id 'org.jetbrains.intellij' version "1.10.0"
 }
 
 dependencies {
   testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.6.1'
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.1'
   testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.1'
   testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.6.1'
-  testCompileOnly 'junit:junit:4.13'
+  testCompileOnly 'junit:junit:4.13.1'
 }
 
 version = "${version}.$buildNumber"
 allprojects {
   repositories { mavenCentral() }
   apply plugin: 'java'
   sourceCompatibility = javaVersion
-  targetCompatibility = javaVersion
+  targetCompatibility = javaTargetVersion
   tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 
   sourceSets {
diff --git a/gradle.properties b/gradle.properties
@@ -3,9 +3,9 @@
 # https://www.jetbrains.com/intellij-repository/snapshots
 
 version = 0.11
-ideaVersion = 2022.2
-javaVersion = 11
-javaTargetVersion = 11
+ideaVersion = 223.7571-EAP-CANDIDATE-SNAPSHOT
+javaVersion = 17
+javaTargetVersion = 17
 buildNumber = SNAPSHOT
 sources = true
 isEAP = false
diff --git a/jps-plugin/build.gradle b/jps-plugin/build.gradle
@@ -1 +1 @@
-jar.archiveName = "jps-plugin.jar"
+jar.archiveFileName = "jps-plugin.jar"
diff --git a/jps-plugin/tests/org/intellij/erlang/jps/BuildResult.java b/jps-plugin/tests/org/intellij/erlang/jps/BuildResult.java
@@ -54,8 +54,8 @@ private boolean isSuccessful() {
   }
 
   public void assertSuccessful() {
-    Function<BuildMessage,String> toStringFunction = StringUtil.createToStringFunction(BuildMessage.class);
+    Function<BuildMessage, String> toStringFunction = Object::toString;
     assertTrue("Build failed. \nErrors:\n" + StringUtil.join(myErrorMessages, toStringFunction, "\n") +
-      "\nInfo messages:\n" + StringUtil.join(myInfoMessages, toStringFunction, "\n"), isSuccessful());
+               "\nInfo messages:\n" + StringUtil.join(myInfoMessages, toStringFunction, "\n"), isSuccessful());
   }
 }
diff --git a/resources/META-INF/ErlangPlugin.xml b/resources/META-INF/ErlangPlugin.xml
@@ -155,7 +155,7 @@
         <referencesSearch implementation="org.intellij.erlang.search.ErlangAtomSearch"/>
         <targetElementEvaluator language="Erlang" implementationClass="org.intellij.erlang.search.ErlangTargetElementEvaluator"/>
 
-        <editorNotificationProvider implementation="org.intellij.erlang.inspection.SetupSDKNotificationProvider"/>
+        <editorNotificationProvider implementation="org.intellij.erlang.inspection.ErlangSdkNotificationProvider"/>
 
         <callHierarchyProvider language="Erlang" implementationClass="org.intellij.erlang.hierarchy.ErlangCallHierarchyProvider"/>
 
diff --git a/src/org/intellij/erlang/ErlangDescriptionProvider.java b/src/org/intellij/erlang/ErlangDescriptionProvider.java
@@ -38,7 +38,7 @@ public class ErlangDescriptionProvider implements ElementDescriptionProvider {
   @Override
   public String getElementDescription(@NotNull PsiElement o, @NotNull ElementDescriptionLocation location) {
     if (!(o instanceof ErlangCompositeElement)) return null;
-    if (location == UsageViewNodeTextLocation.INSTANCE && (o instanceof ErlangNamedElement || o instanceof ErlangQAtom)) {
+    if (location == UsageViewNodeTextLocation.INSTANCE && (o instanceof ErlangNamedElement || o instanceof ErlangQAtom || o instanceof ErlangTypeRef)) {
       return getElementDescription(o, UsageViewShortNameLocation.INSTANCE);
     }
     if (location == UsageViewShortNameLocation.INSTANCE ||
@@ -47,6 +47,7 @@ public String getElementDescription(@NotNull PsiElement o, @NotNull ElementDescr
     ) {
       if (o instanceof ErlangNamedElement) return ((ErlangNamedElement) o).getName();
       if (o instanceof ErlangQAtom) return ErlangPsiImplUtil.getName((ErlangQAtom)o);
+      if (o instanceof ErlangTypeRef) return o.getText();
       if (o instanceof ErlangAttribute) {
         ErlangSpecification spec = ((ErlangAttribute) o).getSpecification();
         if (spec != null) return spec.getName();
@@ -68,6 +69,7 @@ public String getElementDescription(@NotNull PsiElement o, @NotNull ElementDescr
       else if (o instanceof ErlangTypeDefinition) return "type";
       else if (o instanceof ErlangAttribute) return "attribute";
       else if (o instanceof ErlangQAtom) return "atom";
+      else if (o instanceof ErlangTypeRef) return "type";
     }
     LOG.error("Unexpected element " + o.getText() + ", class: " + o.getClass() + ", location: " + location.getClass());
     return "<unknown>";
diff --git a/src/org/intellij/erlang/index/ErlangAtomIndex.java b/src/org/intellij/erlang/index/ErlangAtomIndex.java
@@ -31,6 +31,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 public class ErlangAtomIndex extends ScalarIndexExtension<String> {
@@ -52,7 +53,7 @@ public int getVersion() {
   @Override
   public DataIndexer<String, Void, FileContent> getIndexer() {
     return inputData -> {
-      final Map<String, Void> result = new THashMap<>();
+      final Map<String, Void> result = new HashMap<>();
       PsiFile file = inputData.getPsiFile();
       if (file instanceof ErlangFile) {
         file.accept(new ErlangRecursiveVisitor() {
diff --git a/src/org/intellij/erlang/inspection/ErlangSdkNotificationProvider.java b/src/org/intellij/erlang/inspection/ErlangSdkNotificationProvider.java
@@ -16,22 +16,21 @@
 
 package org.intellij.erlang.inspection;
 
+import com.intellij.ide.IdeDeprecatedMessagesBundle;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectBundle;
-import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ModuleRootModificationUtil;
-import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService;
-import com.intellij.openapi.util.Key;
+import com.intellij.openapi.roots.ui.configuration.SdkPopupFactory;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.ui.EditorNotificationPanel;
-import com.intellij.ui.EditorNotifications;
+import com.intellij.ui.EditorNotificationProvider;
 import org.intellij.erlang.ErlangFileType;
 import org.intellij.erlang.ErlangLanguage;
 import org.intellij.erlang.sdk.ErlangSdkRelease;
@@ -41,20 +40,42 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class SetupSDKNotificationProvider extends EditorNotifications.Provider<EditorNotificationPanel> {
-  private static final Key<EditorNotificationPanel> KEY = Key.create("Setup Erlang SDK");
+import javax.swing.*;
+import java.util.function.Function;
 
+public class ErlangSdkNotificationProvider implements EditorNotificationProvider {
   @NotNull
-  @Override
-  public Key<EditorNotificationPanel> getKey() {
-    return KEY;
+  private static EditorNotificationPanel createPanel(@NotNull final Project project, @NotNull final PsiFile file) {
+    EditorNotificationPanel panel = new EditorNotificationPanel();
+    panel.setText(IdeDeprecatedMessagesBundle.message("project.sdk.not.defined"));
+    panel.createActionLabel(ProjectBundle.message("project.sdk.setup"), () -> {
+      if (ErlangSystemUtil.isSmallIde()) {
+        ShowSettingsUtil.getInstance().showSettingsDialog(project, ErlangExternalToolsConfigurable.ERLANG_RELATED_TOOLS);
+        return;
+      }
+
+      SdkPopupFactory
+        .newBuilder()
+        .withProject(project)
+        .withSdkTypeFilter(type -> type instanceof ErlangSdkType)
+        .updateSdkForFile(file)
+        .onSdkSelected(
+          sdk ->
+            ApplicationManager.getApplication().runWriteAction(() -> {
+              Module module = ModuleUtilCore.findModuleForPsiElement(file);
+              if (module != null) {
+                ModuleRootModificationUtil.setSdkInherited(module);
+              }
+            }))
+        .buildPopup()
+        .showCenteredInCurrentWindow(project);
+    });
+    return panel;
   }
 
-  @Nullable
   @Override
-  public EditorNotificationPanel createNotificationPanel(@NotNull VirtualFile file,
-                                                         @NotNull FileEditor fileEditor,
-                                                         @NotNull Project project) {
+  public @Nullable Function<? super @NotNull FileEditor, ? extends @Nullable JComponent> collectNotificationData(@NotNull Project project,
+                                                                                                                 @NotNull VirtualFile file) {
     if (ApplicationManager.getApplication().isUnitTestMode()) return null;
     if (!(file.getFileType() instanceof ErlangFileType)) return null;
 
@@ -64,28 +85,6 @@ public EditorNotificationPanel createNotificationPanel(@NotNull VirtualFile file
     ErlangSdkRelease sdkRelease = ErlangSdkType.getRelease(psiFile);
     if (sdkRelease != null) return null;
 
-    return createPanel(project, psiFile);
-  }
-
-  @NotNull
-  private static EditorNotificationPanel createPanel(@NotNull final Project project, @NotNull final PsiFile file) {
-    EditorNotificationPanel panel = new EditorNotificationPanel();
-    panel.setText(ProjectBundle.message("project.sdk.not.defined"));
-    panel.createActionLabel(ProjectBundle.message("project.sdk.setup"), () -> {
-      if (ErlangSystemUtil.isSmallIde()) {
-        ShowSettingsUtil.getInstance().showSettingsDialog(project, ErlangExternalToolsConfigurable.ERLANG_RELATED_TOOLS);
-        return;
-      }
-
-      Sdk projectSdk = ProjectSettingsService.getInstance(project).chooseAndSetSdk();
-      if (projectSdk == null) return;
-      ApplicationManager.getApplication().runWriteAction(() -> {
-        Module module = ModuleUtilCore.findModuleForPsiElement(file);
-        if (module != null) {
-          ModuleRootModificationUtil.setSdkInherited(module);
-        }
-      });
-    });
-    return panel;
+    return fileEditor -> createPanel(project, psiFile);
   }
 }
diff --git a/src/org/intellij/erlang/sdk/ErlangSdkRelease.java b/src/org/intellij/erlang/sdk/ErlangSdkRelease.java
@@ -32,6 +32,7 @@ public final class ErlangSdkRelease {
   public static final ErlangSdkRelease V_18_0 = new ErlangSdkRelease("18", "7.0");
 
   private static final Pattern VERSION_PATTERN = Pattern.compile("Erlang/OTP (\\S+) \\[erts-(\\S+)]");
+  private static final Pattern NEW_VERSION_PATTERN = Pattern.compile("OTP (\\S+), erts-(\\S+)");
 
   private final String myOtpRelease;
   private final String myErtsVersion;
@@ -66,7 +67,13 @@ public String toString() {
 
   @Nullable
   static ErlangSdkRelease fromString(@Nullable String versionString) {
-    Matcher m = versionString != null ? VERSION_PATTERN.matcher(versionString) : null;
-    return m != null && m.matches() ? new ErlangSdkRelease(m.group(1), m.group(2)) : null;
+    if (versionString == null) return null;
+    for (Pattern pattern : new Pattern[]{VERSION_PATTERN, NEW_VERSION_PATTERN}) {
+      Matcher m = pattern.matcher(versionString);
+      if (m.matches()) {
+        return new ErlangSdkRelease(m.group(1), m.group(2));
+      }
+    }
+    return null;
   }
 }
diff --git a/src/org/intellij/erlang/sdk/ErlangSdkType.java b/src/org/intellij/erlang/sdk/ErlangSdkType.java
@@ -50,25 +50,22 @@
 import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
+import java.util.*;
 
 public class ErlangSdkType extends SdkType {
   private static final String OTP_RELEASE_PREFIX_LINE = "ErlangSdkType_OTP_RELEASE:";
   private static final String ERTS_VERSION_PREFIX_LINE = "ErlangSdkType_ERTS_VERSION:";
   private static final String PRINT_VERSION_INFO_EXPRESSION =
     "io:format(\"~n~s~n~s~n~s~n~s~n\",[" +
-      "\"" + OTP_RELEASE_PREFIX_LINE + "\"," +
-      "erlang:system_info(otp_release)," +
-      "\"" + ERTS_VERSION_PREFIX_LINE + "\"," +
-      "erlang:system_info(version)" +
-      "]),erlang:halt().";
+    "\"" + OTP_RELEASE_PREFIX_LINE + "\"," +
+    "erlang:system_info(otp_release)," +
+    "\"" + ERTS_VERSION_PREFIX_LINE + "\"," +
+    "erlang:system_info(version)" +
+    "]),erlang:halt().";
   private static final Logger LOG = Logger.getInstance(ErlangSdkType.class);
 
   private final Map<String, ErlangSdkRelease> mySdkHomeToReleaseCache = ApplicationManager.getApplication().isUnitTestMode() ?
-                                                                        new HashMap<>() : ContainerUtil.createWeakMap();
+                                                                        new HashMap<>() : new WeakHashMap<>();
 
   @NotNull
   public static ErlangSdkType getInstance() {
@@ -100,7 +97,7 @@ public String suggestHomePath() {
     else if (SystemInfo.isMac) {
       String macPorts = "/opt/local/lib/erlang";
       if (new File(macPorts).exists()) return macPorts;
-      
+
       // For home brew we trying to find something like /usr/local/Cellar/erlang/*/lib/erlang as SDK root
       for (String version : new String[]{"", "-r14", "-r15", "-r16"}) {
         File brewRoot = new File("/usr/local/Cellar/erlang" + version);
@@ -153,7 +150,8 @@ public String getDefaultDocumentationUrl(@NotNull Sdk sdk) {
 
   @Nullable
   @Override
-  public AdditionalDataConfigurable createAdditionalDataConfigurable(@NotNull SdkModel sdkModel, @NotNull SdkModificator sdkModificator) {
+  public AdditionalDataConfigurable createAdditionalDataConfigurable(@NotNull SdkModel sdkModel,
+                                                                     @NotNull SdkModificator sdkModificator) {
     return null;
   }
 
@@ -234,7 +232,13 @@ private static ErlangSdkRelease getRelease(@NotNull String sdkHome) {
   @Nullable
   private static ErlangSdkRelease detectReleaseWithFiles(@NotNull String sdkHome) {
     try {
-      File startErl = new File(sdkHome, "releases/start_erl.data");
+      File startErl = Arrays.stream(new File[]{
+        new File(sdkHome, "releases/start_erl.data"),
+        new File(sdkHome, "lib/erlang/releases/start_erl.data"),
+        }).filter(File::exists).findFirst().orElse(null);
+
+      if (startErl == null) return null;
+
       String line = ContainerUtil.getFirstItem(FileUtil.loadLines(startErl));
       List<String> split = StringUtil.split(line, " ");
       if (split.size() == 2) {
@@ -338,14 +342,16 @@ private static void setupLocalSdkPaths(@NotNull SdkModificator sdkModificator) {
           }
         }
       }
-    } catch (ExecutionException ignore) {
+    }
+    catch (ExecutionException ignore) {
     }
 
     File stdLibDir = new File("/usr/lib/erlang");
     tryToProcessAsStandardLibraryDir(sdkModificator, stdLibDir);
   }
 
-  private static boolean tryToProcessAsStandardLibraryDir(@NotNull SdkModificator sdkModificator, @NotNull File stdLibDir) {
+  private static boolean tryToProcessAsStandardLibraryDir(@NotNull SdkModificator sdkModificator,
+                                                          @NotNull File stdLibDir) {
     if (!isStandardLibraryDir(stdLibDir)) return false;
     VirtualFile dir = LocalFileSystem.getInstance().findFileByIoFile(stdLibDir);
     if (dir != null) {
@@ -361,7 +367,7 @@ private static boolean isStandardLibraryDir(@NotNull File dir) {
 
   @NotNull
   private static String getDefaultSdkName(@NotNull String sdkHome, @Nullable ErlangSdkRelease version) {
-    return  version != null ? "Erlang " + version.getOtpRelease() : "Unknown Erlang version at " + sdkHome;
+    return version != null ? "Erlang " + version.getOtpRelease() : "Unknown Erlang version at " + sdkHome;
   }
 
   @Nullable
@@ -374,7 +380,7 @@ private static ErlangSdkRelease getRelease(@Nullable Sdk sdk) {
     if (sdk != null && sdk.getSdkType() == getInstance()) {
       ErlangSdkRelease fromVersionString = ErlangSdkRelease.fromString(sdk.getVersionString());
       return fromVersionString != null ? fromVersionString :
-        getInstance().detectSdkVersion(StringUtil.notNullize(sdk.getHomePath()));
+             getInstance().detectSdkVersion(StringUtil.notNullize(sdk.getHomePath()));
     }
     return null;
   }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-jar.archiveName = "jps-plugin.jar"`
	`1`	`+jar.archiveFileName = "jps-plugin.jar"`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ private boolean isSuccessful() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public void assertSuccessful() {`
`57`		`- Function<BuildMessage,String> toStringFunction = StringUtil.createToStringFunction(BuildMessage.class);`
	`57`	`+ Function<BuildMessage, String> toStringFunction = Object::toString;`
`58`	`58`	`assertTrue("Build failed. \nErrors:\n" + StringUtil.join(myErrorMessages, toStringFunction, "\n") +`
`59`		`- "\nInfo messages:\n" + StringUtil.join(myInfoMessages, toStringFunction, "\n"), isSuccessful());`
	`59`	`+ "\nInfo messages:\n" + StringUtil.join(myInfoMessages, toStringFunction, "\n"), isSuccessful());`
`60`	`60`	`}`
`61`	`61`	`}`