diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java index 61d5f5e58627..7b7d2d8755d2 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java @@ -572,7 +572,10 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass if (!inspectionProfile.isToolEnabled(key, getFile())) return; HighlightInfoType type = new InspectionHighlightInfoType(level, element); - final String plainMessage = message.startsWith("") ? StringUtil.unescapeXmlEntities(XmlStringUtil.stripHtml(message).replaceAll("<[^>]*>", "")) : message; + final String plainMessage = message.startsWith("") + ? StringUtil.unescapeXmlEntities(XmlStringUtil.stripHtml(message).replaceAll("<[^>]*>", "")) + .replaceAll(" ", " ") + : message; @NlsSafe String tooltip = null; if (descriptor.showTooltip()) { diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/DependsHighlighting.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/DependsHighlighting.xml index c3160f9b1927..9dfd7f154d46 100644 --- a/plugins/devkit/devkit-java-tests/testData/codeInsight/DependsHighlighting.xml +++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/DependsHighlighting.xml @@ -5,7 +5,7 @@ com.intellij.modules.vcs com.intellij.custom - com.intellij.xxx + com.intellij.xxx optional="false">com.intellij.custom3 diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ExtensionsHighlighting.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ExtensionsHighlighting.xml index d5711eb1ae08..421a03a2485c 100644 --- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ExtensionsHighlighting.xml +++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/ExtensionsHighlighting.xml @@ -72,7 +72,7 @@ - <custom.error + <custom.error customAttribute=""/> <notincluded.notInDependencies/> diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithXInclude.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithXInclude.xml index 85bcdd3d7a9a..1fe6a10925ae 100644 --- a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithXInclude.xml +++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithXInclude.xml @@ -15,7 +15,7 @@ - <extensionUnknown/> + <extensionUnknown/> INVALID_VALUE.xml"/> diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-highlighting.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-highlighting.xml index 2093d283de19..3c6ae2ed36f6 100644 --- a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-highlighting.xml +++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginXmlDynamicPluginInspection/pluginXmlDynamicPluginInspection-highlighting.xml @@ -24,13 +24,13 @@ - <application-components> + <application-components> - <project-components> + <project-components> - <module-components> + <module-components> \ No newline at end of file diff --git a/plugins/java-i18n/testData/inspections/duplicateStringLiteral/PropertyKey.java b/plugins/java-i18n/testData/inspections/duplicateStringLiteral/PropertyKey.java index be892b8ec0fa..5d132bf6de80 100644 --- a/plugins/java-i18n/testData/inspections/duplicateStringLiteral/PropertyKey.java +++ b/plugins/java-i18n/testData/inspections/duplicateStringLiteral/PropertyKey.java @@ -3,11 +3,11 @@ import org.jetbrains.annotations.*; @SuppressWarnings({"HardCodedStringLiteral"}) class Test { @SuppressWarnings({"HardCodedStringLiteral"}) - String s = "abcdefghhijklmnop"; + String s = "abcdefghhijklmnop"; @SuppressWarnings({"HardCodedStringLiteral"}) void f(@PropertyKey(resourceBundle = "xxx.yyy") String key) { - String s = "abcdefghhijklmnop"; + String s = "abcdefghhijklmnop"; f("abcdefghhijklmnop"); //no way } } \ No newline at end of file