Merge pull request #29 from usethesource/fix/smaller-clone-locs

PaulKlint · web-flow · commit 3c8472d2682e · 2025-12-04T17:55:02.000+01:00
Restrict clone location in error message to first line (for readability)
diff --git a/src/analysis/typepal/Collector.rsc b/src/analysis/typepal/Collector.rsc
@@ -1027,9 +1027,10 @@ Collector newCollector(str modelName, map[str,Tree] namedTrees, TypePalConfig co
                 if(logicalLoc in my_logical2physical){
                     if(my_logical2physical[logicalLoc] != def.defined){
                         causes = [ info("Clone of `<def.id>`", my_logical2physical[logicalLoc]),
-                                    info("Clone of `<def.id>`", def.defined) 
+                                   info("Clone of `<def.id>`", def.defined) 
                                  ];
-                        messages += error("Remove code clone for <prettyRole(def.idRole)> `<def.id>`", def.defined, causes=causes);
+                        // restrict clone location to first line for readability
+                        messages += error("Remove code clone for <prettyRole(def.idRole)> `<def.id>`", def.defined[end=<def.defined.begin.line+1,0>], causes=causes);
                     }
                 }
                 my_logical2physical[logicalLoc] = def.defined;

Original file line number	Diff line number	Diff line change
`@@ -1027,9 +1027,10 @@ Collector newCollector(str modelName, map[str,Tree] namedTrees, TypePalConfig co`
`1027`	`1027`	`if(logicalLoc in my_logical2physical){`
`1028`	`1028`	`if(my_logical2physical[logicalLoc] != def.defined){`
`1029`	`1029`	causes = [ info("Clone of `<def.id>`", my_logical2physical[logicalLoc]),
`1030`		- info("Clone of `<def.id>`", def.defined)
	`1030`	+ info("Clone of `<def.id>`", def.defined)
`1031`	`1031`	`];`
`1032`		- messages += error("Remove code clone for <prettyRole(def.idRole)> `<def.id>`", def.defined, causes=causes);
	`1032`	`+ // restrict clone location to first line for readability`
	`1033`	+ messages += error("Remove code clone for <prettyRole(def.idRole)> `<def.id>`", def.defined[end=<def.defined.begin.line+1,0>], causes=causes);
`1033`	`1034`	`}`
`1034`	`1035`	`}`
`1035`	`1036`	`my_logical2physical[logicalLoc] = def.defined;`