From cff373e54289217f2f8fa6299920ef18240106bb Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Wed, 29 Jul 2020 17:13:55 +0700 Subject: [PATCH] [java-stubs] More robust empty FirstPassData handling GitOrigin-RevId: fdd369dce03486f1248189bcf846d392fdbc8a94 --- .../src/com/intellij/psi/impl/compiled/FirstPassData.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/FirstPassData.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/FirstPassData.java index 30427b54108c..abbf6c46cda0 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/FirstPassData.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/FirstPassData.java @@ -167,9 +167,6 @@ class FirstPassData implements Function<@NotNull String, @NotNull String> { } catch (Exception ignored) { } - if (visitor.mapping.isEmpty()) { - return EMPTY; - } String varArgComponent = null; if (visitor.canonicalSignature != null) { visitor.canonicalSignature.append(")V"); @@ -177,6 +174,9 @@ class FirstPassData implements Function<@NotNull String, @NotNull String> { varArgComponent = visitor.lastComponent; } } + if (varArgComponent == null && visitor.mapping.isEmpty()) { + return EMPTY; + } return new FirstPassData(visitor.mapping, varArgComponent); } }