From 5d31b6195a20e3f2aa6fa760850f4b8cc57ef151 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 1 Feb 2016 21:37:01 +0300
Subject: [PATCH] 'Problems' view in 'Project Structure': properly extract
 navigatable part from error message to show hyperlinks not only for module
 names but for libraries and artifacts as well

---
 .../configuration/ErrorPaneConfigurable.java  | 27 ++++++++++++-------
 .../GeneralProjectSettingsElement.java        |  7 ++++-
 .../ui/configuration/ProjectConfigurable.java | 12 ++++++---
 .../ArtifactProjectStructureElement.java      |  2 +-
 .../BaseLibrariesConfigurable.java            |  2 +-
 .../daemon/FacetProjectStructureElement.java  |  7 ++++-
 .../LibraryProjectStructureElement.java       |  2 +-
 .../daemon/ModuleProjectStructureElement.java |  2 +-
 .../daemon/ProjectConfigurationProblem.java   |  7 ++++-
 .../daemon/ProjectStructureElement.java       |  4 +++
 .../ProjectStructureProblemDescription.java   |  3 ++-
 .../daemon/SdkProjectStructureElement.java    |  2 +-
 12 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ErrorPaneConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ErrorPaneConfigurable.java
index e3896f3949d4..b5536e76482b 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ErrorPaneConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ErrorPaneConfigurable.java
@@ -20,6 +20,9 @@ import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.StructureConfigurableContext;
+import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectConfigurationProblem;
+import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStructureElement;
+import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStructureProblemDescription;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.*;
@@ -28,6 +31,7 @@ import com.intellij.util.Alarm;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.update.MergingUpdateQueue;
 import com.intellij.util.ui.update.Update;
+import com.intellij.xml.util.XmlStringUtil;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -156,16 +160,21 @@ public class ErrorPaneConfigurable extends JPanel implements Configurable, Dispo
           i++;
           if (i > 100) break;
           html.append("<li>");
-          String description = error.getDescription();
-          if (description.startsWith("<html>") && description.endsWith("</html>")) {
-            description = description.substring(6, description.length() - 7);
+          String description;
+          if (error instanceof ProjectConfigurationProblem) {
+            //todo[nik] pass ProjectStructureProblemDescription directly and get rid of ConfigurationError at all
+            ProjectStructureProblemDescription problemDescription = ((ProjectConfigurationProblem)error).getProblemDescription();
+            description = problemDescription.getDescription();
+            if (description == null) {
+              ProjectStructureElement place = problemDescription.getPlace().getContainingElement();
+              description = place.getTypeName() + " <a href='http://navigate/" + i + "'>" +  place.getPresentableName() + "</a>: " + problemDescription.getMessage(false);
+            }
+            else {
+              description = XmlStringUtil.stripHtml(description);
+            }
           }
-          if (description.startsWith("Module '")) {
-            final int start = 8;
-            final int end = description.indexOf("'", 9);
-            final String moduleName = description.substring(start, end);
-            description = "Module <a href='http://module/" + StringUtil.escapeXml(moduleName) + "'>" + StringUtil.escapeXml(moduleName) + "</a> " + description.substring(
-              end + 1);
+          else {
+            description = XmlStringUtil.stripHtml(error.getDescription());
           }
           if (error.canBeFixed()) {
             description += " <a href='http://fix/" + i + "'>[Fix]</a>";
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/GeneralProjectSettingsElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/GeneralProjectSettingsElement.java
index 337d3f2bd03a..d42789f1e194 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/GeneralProjectSettingsElement.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/GeneralProjectSettingsElement.java
@@ -48,10 +48,15 @@ public class GeneralProjectSettingsElement extends ProjectStructureElement {
   }
 
   @Override
-  public String getPresentableName() {
+  public String getPresentableText() {
     return "Project";
   }
 
+  @Override
+  public String getPresentableName() {
+    return ProjectStructureConfigurable.getInstance(myContext.getProject()).getProjectConfig().getProjectName();
+  }
+
   @Override
   public String getTypeName() {
     return "Project";
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
index 3db5bf61e449..d134f8a78276 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
@@ -52,6 +52,7 @@ import com.intellij.ui.FieldPanel;
 import com.intellij.ui.InsertPathAction;
 import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -252,7 +253,7 @@ public class ProjectConfigurable extends ProjectStructureElementConfigurable<Pro
         myProjectJdkConfigurable.apply();
 
         if (myProjectName != null) {
-          ((ProjectEx)myProject).setProjectName(myProjectName.getText().trim());
+          ((ProjectEx)myProject).setProjectName(getProjectName());
           if (myDetailsComponent != null) myDetailsComponent.setText(getBannerSlogan());
         }
       }
@@ -305,13 +306,16 @@ public class ProjectConfigurable extends ProjectStructureElementConfigurable<Pro
     if (!Comparing.strEqual(FileUtil.toSystemIndependentName(VfsUtilCore.urlToPath(compilerOutput)),
                             FileUtil.toSystemIndependentName(myProjectCompilerOutput.getText()))) return true;
     if (myProjectJdkConfigurable.isModified()) return true;
-    if (myProjectName != null) {
-      if (!myProjectName.getText().trim().equals(myProject.getName())) return true;
-    }
+    if (!getProjectName().equals(myProject.getName())) return true;
 
     return false;
   }
 
+  @NotNull
+  public String getProjectName() {
+    return myProjectName != null ? myProjectName.getText().trim() : myProject.getName();
+  }
+
   @Nullable
   private String getOriginalCompilerOutputUrl() {
     final CompilerProjectExtension extension = CompilerProjectExtension.getInstance(myProject);
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactProjectStructureElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactProjectStructureElement.java
index 9704d3a2512f..efd7646cc47c 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactProjectStructureElement.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactProjectStructureElement.java
@@ -131,7 +131,7 @@ public class ArtifactProjectStructureElement extends ProjectStructureElement {
 
   @Override
   public String getPresentableName() {
-    return "Artifact '" + getActualArtifactName() + "'";
+    return getActualArtifactName();
   }
 
   @Override
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
index 5fe35d213d33..88abf70358c5 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
@@ -322,7 +322,7 @@ public abstract class BaseLibrariesConfigurable extends BaseStructureConfigurabl
                   sb.append(usagesOfType.size()).append(" ").append(StringUtil.decapitalize(StringUtil.pluralize(type)));
                 }
                 else {
-                  sb.append(StringUtil.decapitalize(usagesOfType.iterator().next().getContainingElement().getPresentableName()));
+                  sb.append(StringUtil.decapitalize(usagesOfType.iterator().next().getContainingElement().getPresentableText()));
                 }
               }
               firstLibraryWithUsageName = library.getName();
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/FacetProjectStructureElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/FacetProjectStructureElement.java
index 3d8f41ec99bb..f8af8026748c 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/FacetProjectStructureElement.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/FacetProjectStructureElement.java
@@ -44,10 +44,15 @@ public class FacetProjectStructureElement extends ProjectStructureElement {
   }
 
   @Override
-  public String getPresentableName() {
+  public String getPresentableText() {
     return "Facet '" + myFacet.getName() + "' in module '" + myFacet.getModule().getName() + "'";
   }
 
+  @Override
+  public String getPresentableName() {
+    return myFacet.getName();
+  }
+
   @Override
   public String getTypeName() {
     return "Facet";
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/LibraryProjectStructureElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/LibraryProjectStructureElement.java
index 6c65e099b582..93bb55b8834d 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/LibraryProjectStructureElement.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/LibraryProjectStructureElement.java
@@ -162,7 +162,7 @@ public class LibraryProjectStructureElement extends ProjectStructureElement {
 
   @Override
   public String getPresentableName() {
-    return "Library '" + myLibrary.getName() + "'";
+    return myLibrary.getName();
   }
 
   @Override
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ModuleProjectStructureElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ModuleProjectStructureElement.java
index cda8763b670c..d95f865b1d16 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ModuleProjectStructureElement.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ModuleProjectStructureElement.java
@@ -142,7 +142,7 @@ public class ModuleProjectStructureElement extends ProjectStructureElement {
 
   @Override
   public String getPresentableName() {
-    return "Module '" + myModule.getName() + "'";
+    return myModule.getName();
   }
 
   @Override
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectConfigurationProblem.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectConfigurationProblem.java
index 77d29bacf01f..f69cda0f2c9c 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectConfigurationProblem.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectConfigurationProblem.java
@@ -26,7 +26,7 @@ import javax.swing.*;
 /**
 * @author nik
 */
-class ProjectConfigurationProblem extends ConfigurationError {
+public class ProjectConfigurationProblem extends ConfigurationError {
   private final ProjectStructureProblemDescription myDescription;
   private final Project myProject;
 
@@ -51,6 +51,11 @@ class ProjectConfigurationProblem extends ConfigurationError {
     return descriptionString != null ? descriptionString : description.getMessage(true);
   }
 
+  @NotNull
+  public ProjectStructureProblemDescription getProblemDescription() {
+    return myDescription;
+  }
+
   @Override
   public void ignore(boolean ignored) {
     super.ignore(ignored);
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureElement.java
index fed82781265d..a141bf20152f 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureElement.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureElement.java
@@ -16,6 +16,10 @@ public abstract class ProjectStructureElement {
     myContext = context;
   }
 
+  public String getPresentableText() {
+    return getTypeName() + " '" + getPresentableName() + "'";
+  }
+
   public abstract String getPresentableName();
 
   @Nullable
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureProblemDescription.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureProblemDescription.java
index e39e696cb9bb..b9a351b63947 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureProblemDescription.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureProblemDescription.java
@@ -63,7 +63,7 @@ public class ProjectStructureProblemDescription {
 
   public String getMessage(final boolean includePlace) {
     if (includePlace && myCanShowPlace) {
-      return myPlace.getContainingElement().getPresentableName() + ": " + StringUtil.decapitalize(myMessage);
+      return myPlace.getContainingElement().getPresentableText() + ": " + StringUtil.decapitalize(myMessage);
     }
     return myMessage;
   }
@@ -81,6 +81,7 @@ public class ProjectStructureProblemDescription {
     return myProblemType.getSeverity();
   }
 
+  @NotNull
   public PlaceInProjectStructure getPlace() {
     return myPlace;
   }
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/SdkProjectStructureElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/SdkProjectStructureElement.java
index b85fde871caf..bf9d7109fd26 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/SdkProjectStructureElement.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/SdkProjectStructureElement.java
@@ -45,7 +45,7 @@ public class SdkProjectStructureElement extends ProjectStructureElement {
 
   @Override
   public String getPresentableName() {
-    return "SDK '" + mySdk.getName() + "'";
+    return mySdk.getName();
   }
 
   @Override