Return default canceled status

Author: zarechenskiy

kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/builder/KotlinAnalysisJob.kt

@@ -34,12 +34,6 @@ public class KotlinAnalysisJob(
         private val affectedFiles: List<IFile>) : Job("Kotlin Analysis") {
     init {
         setPriority(DECORATE)
-        
-        ProgressIndicatorAndCompilationCanceledStatus.setCompilationCanceledStatus(object : CompilationCanceledStatus {
-            override fun checkCanceled() {
-                if (canceled) throw CompilationCanceledException()
-            }
-        })
     }
 
     val familyIndicator = constructFamilyIndicator(javaProject)
@@ -50,15 +44,21 @@ public class KotlinAnalysisJob(
         try {
             canceled = false
 
+            ProgressIndicatorAndCompilationCanceledStatus.setCompilationCanceledStatus(object : CompilationCanceledStatus {
+                override fun checkCanceled() {
+                    if (canceled) throw CompilationCanceledException()
+                }
+            })
+            
             val analysisResult = KotlinAnalysisProjectCache.getAnalysisResult(javaProject)
             val projectFiles = KotlinPsiManager.INSTANCE.getFilesByProject(javaProject.project)
             updateLineMarkers(analysisResult.bindingContext.diagnostics, (projectFiles - affectedFiles).toList())
 
             return Status.OK_STATUS
         } catch (e: CompilationCanceledException) {
-            canceled = false
-            
             return Status.CANCEL_STATUS
+        } finally {
+            ProgressIndicatorAndCompilationCanceledStatus.setCompilationCanceledStatus(null)
         }
     }
 

kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/builder/KotlinBuilder.kt

@@ -126,9 +126,8 @@ private fun clearMarkersFromFiles(files: List<IFile>) {
 }
 
 private fun addMarkersToProject(annotations: Map<IFile, List<DiagnosticAnnotation>>, affectedFiles: List<IFile>) {
-    affectedFiles.forEach { DiagnosticAnnotationUtil.INSTANCE.addParsingDiagnosticAnnotations(it, annotations) }
-    
     for (file in affectedFiles) {
+        DiagnosticAnnotationUtil.INSTANCE.addParsingDiagnosticAnnotations(file, annotations)
         annotations[file]?.forEach { AnnotationManager.addProblemMarker(it, file) }
     }
 }