Merge 972fa95 into 2730859

uqbar-project · Mar 26, 2019 · 2366d1d · 2366d1d
2 parents 2730859 + 972fa95
commit 2366d1d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/...c/org/uqbar/project/wollok/typeSystem/ui/builder/WollokTypeSystemBuilderParticipant.xtend b/...c/org/uqbar/project/wollok/typeSystem/ui/builder/WollokTypeSystemBuilderParticipant.xtend
@@ -39,7 +39,7 @@ class WollokTypeSystemBuilderParticipant implements IXtextBuilderParticipant {
 	override build(IBuildContext context, IProgressMonitor monitor) throws CoreException {
 		val project = context.builtProject
 		val wollokActivator = WollokActivator.getInstance
-		
+
 		// Setting default severity from preferences
 		WollokTypeSystemActivator.^default.setDefaultValuesFor(project)
 
@@ -48,11 +48,11 @@ class WollokTypeSystemBuilderParticipant implements IXtextBuilderParticipant {
 			listenersInitialized = true
 		}
 
+		context.loadAllResources
+		val wollokFiles = context.resourceSet.resources.filter[isWollokUserFile].toList
+
 		WollokTypeSystemActivator.^default.ifEnabledFor(project) [
 			// First add all Wollok files to the type system for constraint generation
-			context.loadAllResources
-
-			val wollokFiles = context.resourceSet.resources.filter[isWollokUserFile].toList
 			log.debug("Infering types for files: " + wollokFiles.map[it.URI.lastSegment])
 
 			val ts = it as ConstraintBasedTypeSystem
@@ -70,16 +70,17 @@ class WollokTypeSystemBuilderParticipant implements IXtextBuilderParticipant {
 				log.fatal("Type inference failed", e)
 			}
 
-			// Refreshing views - markers (problems tab), then outline and finally active editor
-			wollokFiles.forEach [
-				wollokActivator.generateIssues(it)
-				wollokActivator.refreshTypeErrors(project, it, monitor)
-			]
 
-			wollokActivator.refreshOutline
-			wollokActivator.refreshErrorsInEditor
 		]
 
+		// Refreshing views: markers (problems tab), then outline and finally active editor
+		wollokFiles.forEach [
+			wollokActivator.generateIssues(it)
+			wollokActivator.refreshMarkers(project, it, monitor)
+		]
+		wollokActivator.refreshOutline
+		wollokActivator.refreshErrorsInEditor
+
 	}
 
 	def isWollokUserFile(Resource it) { IFile !== null && IFile.isWollokExtension && !isCoreLib }

diff --git a/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/WollokActivator.xtend b/org.uqbar.project.wollok.ui/src/org/uqbar/project/wollok/ui/WollokActivator.xtend
@@ -31,7 +31,6 @@ import org.eclipse.xtext.validation.IResourceValidator
 import org.eclipse.xtext.validation.Issue
 import org.osgi.framework.BundleContext
 import org.uqbar.project.wollok.ui.editor.WollokTextEditor
-import org.uqbar.project.wollok.ui.preferences.WollokDynamicDiagramPreferencePage
 
 import static extension org.uqbar.project.wollok.model.ResourceUtils.*
 import static extension org.uqbar.project.wollok.utils.WEclipseUtils.*
@@ -111,7 +110,7 @@ class WollokActivator extends org.uqbar.project.wollok.ui.internal.WollokActivat
 		mapIssues.put(resource.platformFullPath, issues)
 	}
 
-	def void refreshTypeErrors(IProject project, Resource resource, IProgressMonitor monitor) {
+	def void refreshMarkers(IProject project, Resource resource, IProgressMonitor monitor) {
 		Display.^default.syncExec [
 			val issues = mapIssues.get(resource.platformFullPath)
 			new MarkerIssueProcessor(resource.IFile, markerCreator, markerTypeProvider).processIssues(issues, monitor)