Parse macroBody lazy

dima74 · Sep 15, 2020 · b7ec7cf · b7ec7cf
1 parent 55e81b0
commit b7ec7cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/kotlin/org/rust/lang/core/macros/MacroExpander.kt b/src/main/kotlin/org/rust/lang/core/macros/MacroExpander.kt
@@ -121,12 +121,12 @@ private class NestingState(
     var atTheEnd: Boolean = false
 )
 
-class RsMacroData(val macroBodyStubbed: RsMacroBody?) {
-    constructor(def: RsMacro): this(def.macroBodyStubbed)
+class RsMacroData(val macroBody: Lazy<RsMacroBody?>) {
+    constructor(def: RsMacro) : this(lazy(LazyThreadSafetyMode.PUBLICATION) { def.macroBodyStubbed })
 }
 
 class RsMacroCallData(val macroBody: String?) {
-    constructor(call: RsMacroCall): this(call.macroBody)
+    constructor(call: RsMacroCall) : this(call.macroBody)
 }
 
 class MacroExpander(val project: Project) {
@@ -160,7 +160,7 @@ class MacroExpander(val project: Project) {
         val (macroCallBody, ranges) = project.createAdaptedRustPsiBuilder(call.macroBody ?: return null).lowerDocComments()
         macroCallBody.eof() // skip whitespace
         var start = macroCallBody.mark()
-        val macroCaseList = def.macroBodyStubbed?.macroCaseList ?: return null
+        val macroCaseList = def.macroBody.value?.macroCaseList ?: return null
 
         for (case in macroCaseList) {
             val subst = case.pattern.match(macroCallBody)

diff --git a/src/main/kotlin/org/rust/lang/core/resolve2/DefCollector.kt b/src/main/kotlin/org/rust/lang/core/resolve2/DefCollector.kt
@@ -334,7 +334,6 @@ class DefCollector(
             val defItem = perNs.resolvedDef.macros ?: return false
             defMap.defDatabase.getMacroInfo(defItem)
         }
-        // todo передавать `def.body` лениво, так как скорее всего оно не будет использоваться (если результат будет из кеша)
         val defData = RsMacroDataWithHash(RsMacroData(def.body), def.bodyHash)
         val callData = RsMacroCallDataWithHash(RsMacroCallData(call.body), call.bodyHash)
 
@@ -555,7 +554,8 @@ class MacroDefInfo(
     project: Project,
 ) {
     // todo profile & optimize (`lazy` overhead & RsPsiFactory creation)
-    val body: RsMacroBody? by lazy {
+    /** Lazy because usually it should not be used (thanks to macro expansion cache) */
+    val body: Lazy<RsMacroBody?> = lazy(LazyThreadSafetyMode.PUBLICATION) {
         val psiFactory = RsPsiFactory(project, markGenerated = false)
         psiFactory.createMacroBody(bodyText)
     }