improvements (#28)

- fix: fix more gts referencing issues
- fix: internal helpers references
- fix: remove duplicate eslint messages for gts files
- feature: resolve ember proxies

Author: patricklx

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Changelog
 ===============================================================================
+## 2023.1.18
+- fix: fix more gts referencing issues
+- fix: internal helpers references
+- fix: remove duplicate eslint messages for gts files
+- feature: resolve ember proxies
+
 ## 2023.1.17
 - fix: gts formatting template without class
 

build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 
 
 group = "com.emberjs"
-version = "2023.1.17"
+version = "2023.1.18"
 
 // Configure project's dependencies
 repositories {

src/main/kotlin/com/emberjs/gts/GtsEslintExternalAnnotator.kt

@@ -0,0 +1,47 @@
+package com.emberjs.gts
+
+import com.intellij.lang.javascript.JavaScriptSupportLoader
+import com.intellij.lang.javascript.linter.JSLinterInput
+import com.intellij.lang.javascript.linter.eslint.EslintExternalAnnotator
+import com.intellij.lang.javascript.linter.eslint.EslintState
+import com.intellij.openapi.editor.colors.EditorColorsScheme
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.PsiFile
+
+
+class FakeVirtualVile(val virtualFile: VirtualFile): VirtualFile() {
+
+    override fun isInLocalFileSystem() = true
+    override fun getExtension() = "ts"
+    override fun getName() = virtualFile.name
+    override fun getFileSystem() = virtualFile.fileSystem
+    override fun getPath() = virtualFile.path.replace(".gts", ".ts")
+    override fun isWritable() = virtualFile.isWritable
+    override fun isDirectory() = virtualFile.isDirectory
+    override fun isValid() = virtualFile.isValid
+    override fun getParent() = virtualFile.parent
+    override fun getChildren() = virtualFile.children
+    override fun getOutputStream(requestor: Any?, newModificationStamp: Long, newTimeStamp: Long) = virtualFile.getOutputStream(requestor, newModificationStamp, newTimeStamp)
+    override fun contentsToByteArray() = virtualFile.contentsToByteArray()
+    override fun getTimeStamp() = virtualFile.timeStamp
+    override fun getLength() = virtualFile.length
+    override fun refresh(asynchronous: Boolean, recursive: Boolean, postRunnable: Runnable?) = virtualFile.refresh(asynchronous, recursive, postRunnable)
+    override fun getInputStream() = virtualFile.inputStream
+    override fun getFileType() = virtualFile.fileType
+    override fun getModificationStamp() = 0.0.toLong()
+}
+
+class FakeFile(val psiFile: PsiFile): PsiFile by psiFile {
+    override fun getVirtualFile() = FakeVirtualVile(psiFile.virtualFile)
+
+}
+
+class GtsEslintExternalAnnotator: EslintExternalAnnotator() {
+
+    override fun createInfo(psiFile: PsiFile, state: EslintState, colorsScheme: EditorColorsScheme?): JSLinterInput<EslintState> {
+        return super.createInfo(FakeFile(psiFile.viewProvider.getPsi(JavaScriptSupportLoader.TYPESCRIPT)), state, colorsScheme)
+    }
+    override fun acceptPsiFile(file: PsiFile): Boolean {
+        return file is GtsFile
+    }
+}

src/main/kotlin/com/emberjs/gts/HbLinter.kt

@@ -196,7 +196,7 @@ class HbLintAnnotator() : Annotator {
             annotation.needsUpdateOnTyping()
             annotation.create()
         }
-        if (element is HbPsiElement && element.elementType == HbTokenTypes.ID && (element.reference?.resolve() == null && element.references.find { it is HbReference || it is HbsModuleReference }?.resolve() == null)) {
+        if (element is HbPsiElement && element.elementType == HbTokenTypes.ID && (element.reference?.resolve() == null && !element.references.any { (it is HbReference || it is HbsModuleReference) && it.resolve() != null })) {
             val insideImport = element.parents(false).find { it is HbMustache && it.children.getOrNull(1)?.text == "import"} != null
             if (insideImport) return
             val name = element.text

src/main/kotlin/com/emberjs/hbs/HbsLocalCompletion.kt

@@ -44,8 +44,10 @@ import com.intellij.util.ProcessingContext
 
 class HbsLocalCompletion : CompletionProvider<CompletionParameters>() {
 
-    fun resolveJsType(jsType: JSType?, result: MutableList<LookupElement>, suffix: String = "") {
+    fun resolveJsType(type: JSType?, result: MutableList<LookupElement>, suffix: String = "") {
+        val jsType = EmberUtils.handleEmberProxyTypes(type) ?: type
         val jsRecordType = jsType?.asRecordType()
+        type?.asRecordType()?.propertyNames?.map { LookupElementBuilder.create(it + suffix) }?.toCollection(result)
         if (jsRecordType is JSRecordTypeImpl) {
             val names = jsRecordType.propertyNames
             result.addAll(names.map { LookupElementBuilder.create(it + suffix) })
@@ -221,7 +223,7 @@ class HbsLocalCompletion : CompletionProvider<CompletionParameters>() {
                 rootFolder = rootFolder?.findChild(it) ?: rootFolder
             }
             if (rootFolder != null) {
-                val validExtensions = arrayOf("css", "js", "ts")
+                val validExtensions = arrayOf("css", "js", "ts", "gts", "gjs")
                 val names = rootFolder!!.children.filter { it.isDirectory || validExtensions.contains(it.name.split(".").last()) }
                         .map {
                             val name = it.name

src/main/kotlin/com/emberjs/hbs/HbsLocalReference.kt

@@ -5,7 +5,7 @@ import com.dmarcotte.handlebars.psi.*
 import com.dmarcotte.handlebars.psi.impl.HbOpenBlockMustacheImpl
 import com.dmarcotte.handlebars.psi.impl.HbStatementsImpl
 import com.emberjs.glint.GlintLanguageServiceProvider
-import com.emberjs.gts.GtsFileViewProvider
+import com .emberjs.gts.GtsFileViewProvider
 import com.emberjs.psi.EmberNamedAttribute
 import com.emberjs.psi.EmberNamedElement
 import com.emberjs.refactoring.SimpleNodeFactory
@@ -269,7 +269,19 @@ class HbsLocalReference(private val leaf: PsiElement, val resolved: Any?) : HbRe
                 return any
             }
 
+            if (any is JSRecordTypeImpl.PropertySignatureImpl) {
+                if (path.isEmpty()) {
+                    return any.jsType?.sourceElement
+                }
+                return resolveToJs(any.jsType, path)
+            }
+
             var jsType: JSType? = null
+
+            if (any is JSType) {
+                jsType = any
+            }
+
             if (any is JSTypedEntity) {
                 jsType = any.jsType
             }
@@ -288,6 +300,11 @@ class HbsLocalReference(private val leaf: PsiElement, val resolved: Any?) : HbRe
                         return resolveToJs(res, path, resolveIncomplete, recursionCounter + 1)
                     }
                 }
+                if (jsType is JSRecordTypeImpl && jsType.findPropertySignature(path.first()) != null) {
+                    val elem = jsType.findPropertySignature(path.first())
+                    return resolveToJs(elem, path.subList(1, max(path.lastIndex, 1)), resolveIncomplete, recursionCounter + 1)
+                }
+                jsType = EmberUtils.handleEmberProxyTypes(jsType) ?: jsType
                 jsType = jsType.asRecordType()
                 if (jsType is JSRecordTypeImpl) {
                     val elem = jsType.findPropertySignature(path.first())
@@ -363,7 +380,7 @@ class HbsLocalReference(private val leaf: PsiElement, val resolved: Any?) : HbRe
             if (closeMustache != null) {
                 val blockWrapper = closeMustache.parent
                 val openId = PsiTreeUtil.collectElements(blockWrapper) { HbsPatterns.BLOCK_MUSTACHE_NAME_ID.accepts(it) }.firstOrNull()
-                val ref = openId?.reference ?: openId?.references?.firstOrNull()
+                val ref = openId?.reference ?: openId?.references?.find { it.resolve() != null }
                 return HbsLocalReference(element, ref?.resolve())
             }
 

src/main/kotlin/com/emberjs/hbs/HbsModuleReference.kt

@@ -57,8 +57,8 @@ open class HbsModuleReference(element: PsiElement, val moduleType: String) :
         }
 
         if (moduleType == "component") {
-            if (internalHelpers.properties.map { it.name }.contains(text)) {
-                val prop = internalHelpers.properties.find { it.name == text }
+            if (internalComponents.properties.map { it.name }.contains(text)) {
+                val prop = internalComponents.properties.find { it.name == text }
                 return createResults((prop?.jsType?.sourceElement as JSReferenceExpression).resolve())
             }
         }

src/main/kotlin/com/emberjs/hbs/HbsReferenceContributor.kt

@@ -29,7 +29,9 @@ fun filter(element: PsiElement, fn: (PsiElement) -> PsiReference?): PsiReference
         return null
     }
     if (element.containingFile.viewProvider is GtsFileViewProvider) {
-        return null
+        if (!InternalsWithoutBlock.contains(element.text) && !InternalsWithBlock.contains(element.text)) {
+            return null
+        }
     }
     val res = HbsLocalReference.createReference(element)
     if (res?.resolve() != null && (res.resolve() as? EmberNamedElement)?.target != element) {
@@ -290,6 +292,7 @@ class HbsReferenceContributor : PsiReferenceContributor() {
             register(PlatformPatterns.psiElement(XmlAttribute::class.java)) { toAttributeReference(it as XmlAttribute) }
             register(HbsPatterns.SIMPLE_MUSTACHE_NAME_ID) { filter(it) { HbsComponentReference(it) } }
             register(HbsPatterns.BLOCK_MUSTACHE_NAME_ID) { filter(it) { HbsComponentReference(it) } }
+            register(HbsPatterns.BLOCK_MUSTACHE_NAME_ID) { filter(it) { HbsModuleReference(it, "helper") } }
             register(HbsPatterns.MUSTACHE_ID) { HbsLocalReference.createReference(it) }
             register(HbsPatterns.SIMPLE_MUSTACHE_NAME_ID) { filter(it) { HbsModuleReference(it, "helper") } }
             register(HbsPatterns.SIMPLE_MUSTACHE_NAME_ID) { filter(it) { HbsModuleReference(it, "modifier") } }