LSP: Make C++ line adjustment more comprehensive.

lf-lang · Jan 12, 2022 · 909e433 · 909e433
1 parent e8c4f9c
commit 909e433
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/org.lflang/src/org/lflang/generator/cpp/CppGenerator.kt b/org.lflang/src/org/lflang/generator/cpp/CppGenerator.kt
@@ -127,8 +127,10 @@ class CppGenerator(
             if (!r.isGeneric)
                 cppSources.add(sourceFile)
             codeMaps[fileConfig.srcGenPath.resolve(sourceFile)] = reactorCodeMap
+            val headerCodeMap = CodeMap.fromGeneratedCode(generator.generateHeader())
+            codeMaps[fileConfig.srcGenPath.resolve(headerFile)] = headerCodeMap
 
-            fsa.generateFile(relSrcGenPath.resolve(headerFile).toString(), generator.generateHeader())
+            fsa.generateFile(relSrcGenPath.resolve(headerFile).toString(), headerCodeMap.generatedCode)
             fsa.generateFile(relSrcGenPath.resolve(sourceFile).toString(), reactorCodeMap.generatedCode)
         }
 
@@ -140,8 +142,10 @@ class CppGenerator(
             val preambleCodeMap = CodeMap.fromGeneratedCode(generator.generateSource())
             cppSources.add(sourceFile)
             codeMaps[fileConfig.srcGenPath.resolve(sourceFile)] = preambleCodeMap
+            val headerCodeMap = CodeMap.fromGeneratedCode(generator.generateHeader())
+            codeMaps[fileConfig.srcGenPath.resolve(headerFile)] = headerCodeMap
 
-            fsa.generateFile(relSrcGenPath.resolve(headerFile).toString(), generator.generateHeader())
+            fsa.generateFile(relSrcGenPath.resolve(headerFile).toString(), headerCodeMap.generatedCode)
             fsa.generateFile(relSrcGenPath.resolve(sourceFile).toString(), preambleCodeMap.generatedCode)
         }