- fix: correctly resolve internal ember components

Author: patricklx

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog
 ===============================================================================
+## v2020.3.29
+- fix: correctly resolve internal ember components
+
 ## v2020.3.28
 - fix: correctly resolve paths from args and fix completion
 

src/main/kotlin/com/emberjs/EmberXmlElementDescriptor.kt

@@ -81,6 +81,10 @@ class EmberXmlElementDescriptor(private val tag: XmlTag, private val declaration
         f = EmberUtils.followReferences(target)?.containingFile?.originalFile
         val file = f ?: target.containingFile.originalFile
 
+        if (file.name == "intellij-emberjs/internal/components-stub") {
+            return EmberUtils.getComponentReferenceData(target)
+        }
+
         return EmberUtils.getComponentReferenceData(file)
     }
 

src/main/kotlin/com/emberjs/utils/EmberUtils.kt

@@ -362,9 +362,9 @@ class EmberUtils {
             return null
         }
 
-        fun getComponentReferenceData(file: PsiFile): ComponentReferenceData {
-            var name = file.name.split(".").first()
-            val dir = file.parent as PsiDirectoryImpl?
+        fun getComponentReferenceData(file: PsiElement): ComponentReferenceData {
+            var name = file.containingFile.name.split(".").first()
+            val dir = file.containingFile.parent as PsiDirectoryImpl?
             var template: PsiFile? = null
             var path = ""
             var parentModule: PsiDirectory? = null

src/main/resources/com/emberjs/external/ember-components.ts

@@ -279,7 +279,7 @@ class InputComponent extends Component<{
   /**
    *  This argument is used to control which Ember component is used under the hood
    */
-  type?: 'checkbox|button|color|date|datetime-local|email|file|hidden|image|month|number|password|radio|range|reset|search|submit|tel|text|time|url|week'
+  type?: 'checkbox'|'button'|'color'|'date'|'datetime-local'|'email'|'file'|'hidden'|'image'|'month'|'number'|'password'|'radio'|'range'|'reset'|'search'|'submit'|'tel'|'text'|'time'|'url'|'week'
   'enter'?: Function,
   'insert-newline'?: Function,
   'escape-press'?: Function,