Handle ctags failing to report the correct line number

Author: cmaglie

ls/ls_clang_to_ide.go

@@ -35,7 +35,7 @@ func (ls *INOLanguageServer) clang2IdeRangeAndDocumentURI(logger jsonrpc.Functio
 		if inPreprocessed {
 			logger.Logf("Range is in PREPROCESSED section of the sketch")
 		}
-		logger.Logf("Range: %s:%s -> %s:%s", clangURI, clangRange, ideURI, ideRange)
+		logger.Logf("Range: %s:%s -> %s:%s (.ino)", clangURI, clangRange, ideURI, ideRange)
 		return ideURI, ideRange, inPreprocessed, err
 	}
 
@@ -49,7 +49,7 @@ func (ls *INOLanguageServer) clang2IdeRangeAndDocumentURI(logger jsonrpc.Functio
 	}
 	if !inside {
 		ideURI := clangURI
-		logger.Logf("Range: %s:%s -> %s:%s", clangURI, clangRange, ideURI, ideRange)
+		logger.Logf("Range: %s:%s -> %s:%s (ext file)", clangURI, clangRange, ideURI, ideRange)
 		return clangURI, clangRange, false, nil
 	}
 
@@ -67,7 +67,7 @@ func (ls *INOLanguageServer) clang2IdeRangeAndDocumentURI(logger jsonrpc.Functio
 	if ideRange.Start.Line > 0 {
 		ideRange.Start.Line--
 	}
-	logger.Logf("Range: %s:%s -> %s:%s", clangURI, clangRange, ideURI, ideRange)
+	logger.Logf("Range: %s:%s -> %s:%s (.cpp/.h)", clangURI, clangRange, ideURI, ideRange)
 	return ideURI, ideRange, false, err
 }
 

sourcemapper/ino.go

@@ -177,7 +177,14 @@ func (s *SketchMapper) regeneratehMapping() {
 			sourceFile = paths.New(unquoteCppString(tokens[2])).Canonical().String()
 			s.cppToIno[targetLine] = NotIno
 		} else if sourceFile != "" {
-			s.mapLine(sourceFile, sourceLine, targetLine)
+			// Sometimes the Arduino preprocessor fails to interpret correctly the code
+			// and may report a "#line 0" directive leading to a negative sourceLine.
+			// In this rare cases just interpret the source line as a NotIno line.
+			if sourceLine >= 0 {
+				s.mapLine(sourceFile, sourceLine, targetLine)
+			} else {
+				s.cppToIno[targetLine] = NotIno
+			}
 			sourceLine++
 		} else {
 			s.cppToIno[targetLine] = NotIno