- fix: gts formatting freeze on large files

- fix: remove import suggestions for args properties in templates

Author: patricklx

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Changelog
 ===============================================================================
+## 2023.1.47
+- fix: gts formatting freeze on large files
+- fix: remove import suggestions for args properties in templates
+
 ## 2023.1.44
 - fix: fix formatting issues in gts files
 

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 
 
 group = "com.emberjs"
-version = "2023.1.46"
+version = "2023.1.47"
 
 // Configure project's dependencies
 repositories {

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

@@ -639,6 +639,7 @@ val NoWrap = Wrap.createWrap(WrapType.NONE, false).apply { ignoreParentWraps() }
 // wrapper to patch JsBlocks to include outer language block into JSAssignmentExpression and JSVarStatement
 open class JsBlockWrapper(val block: Block, val parent: JsBlockWrapper?, var hbsBlock: Block? = null): Block by block {
 
+    private var cachedBlocks: List<JsBlockWrapper>? = null
     val astnode by lazy {
         return@lazy (block as? ASTBlock)?.node
     }
@@ -675,9 +676,10 @@ open class JsBlockWrapper(val block: Block, val parent: JsBlockWrapper?, var hbs
     }
 
     override fun getSubBlocks(): MutableList<JsBlockWrapper> {
-        val blocks = block.subBlocks.map { mapToWrapper(it, hbsBlock) }.toMutableList()
-        if (block is AnotherLanguageBlockWrapper) {
+        if (this.cachedBlocks != null) {
+            return this.cachedBlocks!!.toMutableList()
         }
+        val blocks = block.subBlocks.map { mapToWrapper(it, hbsBlock) }.toMutableList()
 
         blocks.toTypedArray().forEach {
             blocks.removeIf { it.block is RootBlockWrapper && it.block.patched }
@@ -698,6 +700,7 @@ open class JsBlockWrapper(val block: Block, val parent: JsBlockWrapper?, var hbs
                 }
             }
         }
+        this.cachedBlocks = blocks.toList()
         return blocks
     }
 }

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

@@ -2,6 +2,7 @@ package com.emberjs.gts
 
 import com.dmarcotte.handlebars.file.HbFileViewProvider
 import com.dmarcotte.handlebars.parsing.HbTokenTypes
+import com.dmarcotte.handlebars.psi.HbData
 import com.dmarcotte.handlebars.psi.HbMustache
 import com.dmarcotte.handlebars.psi.HbPsiElement
 import com.dmarcotte.handlebars.psi.HbPsiFile
@@ -225,7 +226,8 @@ class HbLintAnnotator() : Annotator {
                     .tooltip(message)
             val prevSiblingIsSep = element.parent.prevSibling.elementType == HbTokenTypes.SEP ||
                     element.prevSibling.elementType == HbTokenTypes.SEP
-            if (!prevSiblingIsSep) {
+            val isInHbData = element.parent !is HbData
+            if (!prevSiblingIsSep && !isInHbData) {
                 candidates?.forEach { c ->
                     val icwe = JSImportCandidateWithExecutor(c, ES6AddImportExecutor(tsFile))
                     val fix = GtsImportFix(element, icwe, JSImportModuleFix.HintMode.SINGLE)