@@ -92,7 +92,7 @@ func (r *SketchRebuilder) rebuilderLoop() {
9292 r .cancel = cancel
9393 r .mutex .Unlock ()
9494
95- if err := r .doRebuild (ctx , logger ); err != nil {
95+ if err := r .doRebuildArduinoPreprocessedSketch (ctx , logger ); err != nil {
9696 logger .Logf ("Error: %s" , err )
9797 }
9898
@@ -104,10 +104,9 @@ func (r *SketchRebuilder) rebuilderLoop() {
104104 }
105105}
106106
107- func (r * SketchRebuilder ) doRebuild (ctx context.Context , logger jsonrpc.FunctionLogger ) error {
107+ func (r * SketchRebuilder ) doRebuildArduinoPreprocessedSketch (ctx context.Context , logger jsonrpc.FunctionLogger ) error {
108108 ls := r .ls
109-
110- if success , err := ls .generateBuildEnvironment (ctx , logger ); err != nil {
109+ if success , err := ls .generateBuildEnvironment (ctx , ! r .ls .config .SkipLibrariesDiscoveryOnRebuild , logger ); err != nil {
111110 return err
112111 } else if ! success {
113112 return fmt .Errorf ("build failed" )
@@ -123,14 +122,10 @@ func (r *SketchRebuilder) doRebuild(ctx context.Context, logger jsonrpc.Function
123122 default :
124123 }
125124
126- if err := ls .buildPath .Join ("compile_commands.json" ).CopyTo (ls .compileCommandsDir .Join ("compile_commands.json" )); err != nil {
127- logger .Logf ("ERROR: updating compile_commands: %s" , err )
128- }
129-
130125 if cppContent , err := ls .buildSketchCpp .ReadFile (); err == nil {
131- oldVesrion := ls .sketchMapper .CppText .Version
126+ oldVersion := ls .sketchMapper .CppText .Version
132127 ls .sketchMapper = sourcemapper .CreateInoMapper (cppContent )
133- ls .sketchMapper .CppText .Version = oldVesrion + 1
128+ ls .sketchMapper .CppText .Version = oldVersion + 1
134129 ls .sketchMapper .DebugLogAll ()
135130 } else {
136131 return errors .WithMessage (err , "reading generated cpp file from sketch" )
@@ -143,7 +138,7 @@ func (r *SketchRebuilder) doRebuild(ctx context.Context, logger jsonrpc.Function
143138 TextDocument : lsp.TextDocumentIdentifier {URI : cppURI },
144139 }
145140 if err := ls .Clangd .conn .TextDocumentDidSave (didSaveParams ); err != nil {
146- logger .Logf ("error reinitilizing clangd:" , err )
141+ logger .Logf ("error reinitializing clangd:" , err )
147142 return err
148143 }
149144
@@ -159,18 +154,24 @@ func (r *SketchRebuilder) doRebuild(ctx context.Context, logger jsonrpc.Function
159154 },
160155 }
161156 if err := ls .Clangd .conn .TextDocumentDidChange (didChangeParams ); err != nil {
162- logger .Logf ("error reinitilizing clangd:" , err )
157+ logger .Logf ("error reinitializing clangd:" , err )
163158 return err
164159 }
165160
166161 return nil
167162}
168163
169- func (ls * INOLanguageServer ) generateBuildEnvironment (ctx context.Context , logger jsonrpc.FunctionLogger ) (bool , error ) {
164+ func (ls * INOLanguageServer ) generateBuildEnvironment (ctx context.Context , fullBuild bool , logger jsonrpc.FunctionLogger ) (bool , error ) {
165+ var buildPath * paths.Path
166+ if fullBuild {
167+ buildPath = ls .fullBuildPath
168+ } else {
169+ buildPath = ls .buildPath
170+ }
171+
170172 // Extract all build information from language server status
171173 ls .readLock (logger , false )
172174 sketchRoot := ls .sketchRoot
173- buildPath := ls .buildPath
174175 config := ls .config
175176 type overridesFile struct {
176177 Overrides map [string ]string `json:"overrides"`
@@ -204,6 +205,7 @@ func (ls *INOLanguageServer) generateBuildEnvironment(ctx context.Context, logge
204205 BuildPath : buildPath .String (),
205206 CreateCompilationDatabaseOnly : true ,
206207 Verbose : true ,
208+ SkipLibrariesDiscovery : ! fullBuild ,
207209 }
208210 compileReqJson , _ := json .MarshalIndent (compileReq , "" , " " )
209211 logger .Logf ("Running build with: %s" , string (compileReqJson ))
@@ -264,9 +266,12 @@ func (ls *INOLanguageServer) generateBuildEnvironment(ctx context.Context, logge
264266 "--source-override" , overridesJSON .String (),
265267 "--build-path" , buildPath .String (),
266268 "--format" , "json" ,
267- //"--clean",
268- sketchRoot .String (),
269269 }
270+ if ! fullBuild {
271+ args = append (args , "--skip-libraries-discovery" )
272+ }
273+ args = append (args , sketchRoot .String ())
274+
270275 cmd , err := executils .NewProcess (nil , args ... )
271276 if err != nil {
272277 return false , errors .Errorf ("running %s: %s" , strings .Join (args , " " ), err )
@@ -298,6 +303,11 @@ func (ls *INOLanguageServer) generateBuildEnvironment(ctx context.Context, logge
298303 success = res .Success
299304 }
300305
306+ if fullBuild {
307+ ls .CopyFullBuildResults (logger , buildPath )
308+ return ls .generateBuildEnvironment (ctx , false , logger )
309+ }
310+
301311 // TODO: do canonicalization directly in `arduino-cli`
302312 canonicalizeCompileCommandsJSON (buildPath .Join ("compile_commands.json" ))
303313
0 commit comments