From 909e4330545cc5e401b1b97a50c7bce297ff079d Mon Sep 17 00:00:00 2001 From: Peter Donovan Date: Tue, 11 Jan 2022 20:54:14 -0800 Subject: [PATCH] LSP: Make C++ line adjustment more comprehensive. --- org.lflang/src/org/lflang/generator/cpp/CppGenerator.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.lflang/src/org/lflang/generator/cpp/CppGenerator.kt b/org.lflang/src/org/lflang/generator/cpp/CppGenerator.kt index fb250585cd..13d5c9d4d2 100644 --- 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) }