Several improvements

- Copy header files from sketch to temp dir
- Filter lines beginning with ERROR: or WARNING:
- Hide diagnostics that cannot be mapped to a source line
- Improved error message when header file cannot be found

Author: spoenemann

handler/builder.go

@@ -40,6 +40,12 @@ func generateCpp(inoCode []byte, sourcePath, fqbn string) (cppPath string, cppCo
 		log.Println("Source file written to", inoPath)
 	}
 
+	// Copy all header files to temp dir
+	err = copyHeaderFiles(filepath.Dir(sourcePath), tempDir)
+	if err != nil {
+		return
+	}
+
 	// Generate compile_flags.txt
 	cppPath = filepath.Join(tempDir, name+".cpp")
 	flagsPath, err := generateCompileFlags(tempDir, inoPath, sourcePath, fqbn)
@@ -55,6 +61,27 @@ func generateCpp(inoCode []byte, sourcePath, fqbn string) (cppPath string, cppCo
 	return
 }
 
+func copyHeaderFiles(sourceDir string, destDir string) error {
+	fileInfos, err := ioutil.ReadDir(sourceDir)
+	if err != nil {
+		return err
+	}
+	for _, fileInfo := range fileInfos {
+		if !fileInfo.IsDir() && strings.HasSuffix(fileInfo.Name(), ".h") {
+			input, err := ioutil.ReadFile(filepath.Join(sourceDir, fileInfo.Name()))
+			if err != nil {
+				return err
+			}
+
+			err = ioutil.WriteFile(filepath.Join(destDir, fileInfo.Name()), input, 0644)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func updateCpp(inoCode []byte, sourcePath, fqbn string, fqbnChanged bool, cppPath string) (cppCode []byte, err error) {
 	tempDir := filepath.Dir(cppPath)
 	inoPath := strings.TrimSuffix(cppPath, ".cpp")
@@ -132,6 +159,9 @@ func generateTargetFile(tempDir, inoPath, cppPath, fqbn string) (cppCode []byte,
 		return
 	}
 
+	// Filter lines beginning with ERROR or WARNING
+	cppCode = []byte(filterErrorsAndWarnings(cppCode))
+
 	err = ioutil.WriteFile(cppPath, cppCode, 0600)
 	if err != nil {
 		err = errors.Wrap(err, "Error while writing target file to temporary directory.")
@@ -141,6 +171,19 @@ func generateTargetFile(tempDir, inoPath, cppPath, fqbn string) (cppCode []byte,
 	return
 }
 
+func filterErrorsAndWarnings(cppCode []byte) string {
+	var sb strings.Builder
+	scanner := bufio.NewScanner(bytes.NewReader(cppCode))
+	for scanner.Scan() {
+		lineStr := scanner.Text()
+		if !(strings.HasPrefix(lineStr, "ERROR:") || strings.HasPrefix(lineStr, "WARNING:")) {
+			sb.WriteString(lineStr)
+			sb.WriteRune('\n')
+		}
+	}
+	return sb.String()
+}
+
 func copyIno2Cpp(inoCode string, cppPath string) (cppCode []byte, err error) {
 	inoPath := strings.TrimSuffix(cppPath, ".cpp")
 	filePrefix := "#include <Arduino.h>\n#line 1 \"" + inoPath + "\"\n"

handler/handler.go

@@ -398,8 +398,8 @@ func (handler *InoHandler) handleError(ctx context.Context, err error) error {
 			panic(regexpErr)
 		}
 		submatch := exp.FindStringSubmatch(errorStr)
-		message = "Editor support may be inaccurate because the library `" + submatch[1] + "` is not installed."
-		message += " Use the Library Manager to install it"
+		message = "Editor support may be inaccurate because the header `" + submatch[1] + ".h` was not found."
+		message += " If it is part of a library, use the Library Manager to install it"
 	} else {
 		message = "Could not start editor support.\n" + errorStr
 	}
@@ -783,11 +783,16 @@ func (handler *InoHandler) transformParamsToStdio(method string, raw *json.RawMe
 func (handler *InoHandler) cpp2inoPublishDiagnosticsParams(params *lsp.PublishDiagnosticsParams) error {
 	if data, ok := handler.data[params.URI]; ok {
 		params.URI = data.sourceURI
+		newDiagnostics := make([]lsp.Diagnostic, 0, len(params.Diagnostics))
 		for index := range params.Diagnostics {
 			r := &params.Diagnostics[index].Range
-			r.Start.Line = data.sourceLineMap[r.Start.Line]
-			r.End.Line = data.sourceLineMap[r.End.Line]
+			if startLine, ok := data.sourceLineMap[r.Start.Line]; ok {
+				r.Start.Line = startLine
+				r.End.Line = data.sourceLineMap[r.End.Line]
+				newDiagnostics = append(newDiagnostics, params.Diagnostics[index])
+			}
 		}
+		params.Diagnostics = newDiagnostics
 	}
 	return nil
 }