From ae3159f8098d824dcc0c69c76df40d3bff06978c Mon Sep 17 00:00:00 2001
From: Martin Weber <fifteenknots505@gmail.com>
Date: Mon, 21 Sep 2020 20:52:13 +0200
Subject: [PATCH] Bug 567220: CompileCommandsJsonParser error markers are not
 deleted from the problems view

Change-Id: Idb1f3fc3429c06a89550a9446c88c2181f3d8cdb
Signed-off-by: Martin Weber <fifteenknots505@gmail.com>
---
 .../eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
index ec1e9c9c632..e7164ff8139 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
@@ -146,6 +146,7 @@ public class CompileCommandsJsonParser {
 		final IProject project = configuration.getBuildConfiguration().getProject();
 		java.nio.file.Path buildRoot = Paths.get(configuration.getBuildDirectoryURI());
 
+		project.deleteMarkers(MARKER_ID, false, IResource.DEPTH_INFINITE);
 		final java.nio.file.Path jsonFile = buildRoot.resolve("compile_commands.json"); //$NON-NLS-1$
 		if (!Files.exists(jsonFile)) {
 			// no json file was produced in the build
@@ -159,7 +160,7 @@ public class CompileCommandsJsonParser {
 		try {
 			tsJsonModified = Files.getLastModifiedTime(jsonFile).toMillis();
 		} catch (IOException e) {
-			// tread as 'file does nor exist'
+			// treat as 'file is not modified'
 			return false;
 		}
 		IContainer buildContainer = configuration.getBuildContainer();
@@ -169,7 +170,6 @@ public class CompileCommandsJsonParser {
 		if (sessionLastModified == null || sessionLastModified.longValue() < tsJsonModified) {
 			// must parse json file...
 			monitor.setTaskName(Messages.CompileCommandsJsonParser_msg_processing);
-			project.deleteMarkers(MARKER_ID, false, IResource.DEPTH_INFINITE);
 
 			try (Reader in = new FileReader(jsonFile.toFile())) {
 				// parse file...