WEB-35313 Angular - support templates referenced through import state…

…ment - post review fixes.
3838438-idea · Nov 22, 2018 · b80d06a · b80d06a
1 parent a48a088
commit b80d06a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/AngularJS/src/org/angularjs/index/AngularIndexUtil.java b/AngularJS/src/org/angularjs/index/AngularIndexUtil.java
@@ -2,17 +2,15 @@
 
 import com.intellij.lang.ecmascript6.psi.ES6ImportedBinding;
 import com.intellij.lang.javascript.DialectDetector;
-import com.intellij.lang.javascript.ecmascript6.TypeScriptResolveProcessor;
 import com.intellij.lang.javascript.psi.JSImplicitElementProvider;
 import com.intellij.lang.javascript.psi.JSQualifiedNameImpl;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.impl.JSOffsetBasedImplicitElement;
-import com.intellij.lang.javascript.psi.impl.JSReferenceExpressionImpl;
 import com.intellij.lang.javascript.psi.resolve.JSResolveResult;
-import com.intellij.lang.javascript.psi.resolve.ResolveResultSink;
 import com.intellij.lang.javascript.psi.stubs.JSElementIndexingData;
 import com.intellij.lang.javascript.psi.stubs.JSImplicitElement;
 import com.intellij.lang.javascript.psi.stubs.impl.JSImplicitElementImpl;
+import com.intellij.lang.javascript.psi.util.JSStubBasedPsiTreeUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.NoAccessDuringPsiEvents;
@@ -34,7 +32,6 @@
 import com.intellij.psi.util.ParameterizedCachedValueProvider;
 import com.intellij.util.ConcurrencyUtil;
 import com.intellij.util.Function;
-import com.intellij.util.ObjectUtils;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.indexing.FileBasedIndex;
@@ -200,14 +197,10 @@ else if (resolvedElement instanceof ES6ImportedBinding) {
 
   @NotNull
   public static List<PsiElement> resolveLocally(@NotNull JSReferenceExpression ref) {
-    final TypeScriptResolveProcessor<ResolveResultSink> localProcessor =
-      new TypeScriptResolveProcessor<>(ref.getReferenceName(), ref.getContainingFile(), ref);
-    if (ref.getQualifier() == null) {
-      localProcessor.setToProcessHierarchy(false);
-      JSReferenceExpressionImpl.doProcessLocalDeclarations(ref, null, localProcessor,
-                                                           false, false, true, null);
+    if (ref.getQualifier() == null && ref.getReferenceName() != null) {
+      return JSStubBasedPsiTreeUtil.resolveLocallyWithMergedResults(ref.getReferenceName(), ref);
     }
-    return ObjectUtils.notNull(localProcessor.getResults(), Collections::emptyList);
+    return Collections.emptyList();
   }
 
   public static String convertRestrictions(final Project project, String restrictions) {

diff --git a/AngularJS/src/org/angularjs/index/AngularJSIndexingHandler.java b/AngularJS/src/org/angularjs/index/AngularJSIndexingHandler.java
@@ -715,7 +715,6 @@ && isControllerProperty(property)) {
   private static boolean processTemplateUrlProperty(@NotNull JSProperty property, @NotNull JSElementIndexingData data) {
     JSExpression value;
     if ((value = property.getValue()) instanceof JSLiteralExpression
-        && ((JSLiteralExpression)value).isQuotedLiteral()
         && isControllerProperty(property)) {
       return indexComponentTemplateRef(property, unquote(value), data);
     }
@@ -725,7 +724,7 @@ && isControllerProperty(property)) {
   private static boolean indexComponentTemplateRef(@NotNull JSProperty property,
                                                    @Nullable String url,
                                                    @NotNull JSElementIndexingData data) {
-    if (StringUtil.isEmpty(url)) {
+    if (StringUtil.isEmptyOrSpaces(url)) {
       return false;
     }
     String fileName = new File(url).getName();