Merge pull request #2648 from usethesource/fix/check-ignored-test

Fix/check ignored test

Author: DavyLandman

pom.xml

@@ -458,7 +458,7 @@
         <dependency>
             <groupId>org.rascalmpl</groupId>
             <artifactId>typepal</artifactId>
-            <version>0.16.3</version>
+            <version>0.16.4</version>
            <!-- <scope>provided</scope> for shade plugin it can't be provided. At least the rascal dependency in typepal should be provided -->
            <scope>compile</scope>
         </dependency>

src/org/rascalmpl/compiler/lang/rascalcore/check/CollectDeclaration.rsc

@@ -265,7 +265,7 @@ void collect(current: (FunctionDeclaration) `<FunctionDeclaration decl>`, Collec
     ppfname = prettyPrintName(fname);
     modifiers = ["<m>" | m <- signature.modifiers.modifiers];
     tagsMap = getTags(decl.tags);
-    if(ignoreCompiler(tagsMap)) {
+    if(ignoreCompiler(tagsMap) && "test" notin modifiers) {
         c.report(info(fname, "Ignoring function declaration for `<decl.signature.name>`"));
         return;
     }

src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc

@@ -44,7 +44,6 @@ import lang::rascalcore::check::NameUtils;
 import lang::rascalcore::compile::Rascal2muRascal::TmpAndLabel;
 
 import Location;
-import analysis::typepal::LocationChecks;
 
 import lang::rascalcore::check::BasicRascalConfig;
 import lang::rascalcore::check::BuiltinFields;
@@ -54,8 +53,7 @@ import lang::rascalcore::check::AType;
 import lang::rascalcore::check::ATypeUtils;
 
 import lang::rascalcore::check::ATypeInstantiation;
-
-
+import analysis::typepal::LocationChecks;
 
 /*
  * This module provides a bridge to the "TModel" delivered by the type checker
@@ -268,7 +266,7 @@ private loc findContainer(Define d){
     }
     return cscope;
 }
-  
+
 str findDefiningModule(loc l){
     for(ms <- module_scopes,isContainedIn(l, ms, current_tmodel.logical2physical)){
         return definitions[ms].id;