svn commit: r1869575 - /uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java

[pk...@apache.org]

Author: pkluegl
Date: Fri Nov  8 16:18:25 2019
New Revision: 1869575

URL: http://svn.apache.org/viewvc?rev=1869575&view=rev
Log:
UIMA-4676: semantic highlighting ignores implicit features

Modified:
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java?rev=1869575&r1=1869574&r2=1869575&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java Fri Nov  8 16:18:25 2019
@@ -22,6 +22,8 @@ package org.apache.uima.ruta.ide.ui.edit
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.uima.ruta.UIMAConstants;
 import org.apache.uima.ruta.ide.parser.ast.ActionFactory;
 import org.apache.uima.ruta.ide.parser.ast.ComponentDeclaration;
 import org.apache.uima.ruta.ide.parser.ast.ComponentReference;
@@ -50,7 +52,7 @@ public class ReferenceFinder extends AST
       if (ActionFactory.IMPLICIT.equals(a.getName()) && !a.getChilds().isEmpty()) {
         ASTNode expression = a.getChilds().get(0);
         if (expression != null && !expression.getChilds().isEmpty()) {
-          return (ASTNode) expression.getChilds().get(0);
+          return expression.getChilds().get(0);
         }
       }
     }
@@ -59,7 +61,7 @@ public class ReferenceFinder extends AST
       if (ConditionFactory.IMPLICIT.equals(c.getName()) && !c.getChilds().isEmpty()) {
         ASTNode expression = c.getChilds().get(0);
         if (expression != null && !expression.getChilds().isEmpty()) {
-          return (ASTNode) expression.getChilds().get(0);
+          return expression.getChilds().get(0);
         }
       }
     }
@@ -71,7 +73,7 @@ public class ReferenceFinder extends AST
     if (s instanceof RutaVariableReference && node instanceof RutaVariableReference) {
       RutaVariableReference vr0 = (RutaVariableReference) node;
       RutaVariableReference vr1 = (RutaVariableReference) s;
-      if (vr1.getStringRepresentation().equals(vr0.getStringRepresentation())
+      if (compare(vr1.getStringRepresentation(), vr0.getStringRepresentation())
               && vr1.getType() == vr0.getType()) {
         result.add(s);
       }
@@ -80,19 +82,19 @@ public class ReferenceFinder extends AST
     } else if (s instanceof ComponentReference && node instanceof ComponentReference) {
       ComponentReference cr1 = (ComponentReference) node;
       ComponentReference cr2 = (ComponentReference) s;
-      if (cr1.getName().equals(cr2.getName())) {
+      if (compare(cr1.getName(), cr2.getName())) {
         result.add(s);
       }
     } else if (s instanceof RutaAction && node instanceof RutaAction) {
       RutaAction a1 = (RutaAction) node;
       RutaAction a2 = (RutaAction) s;
-      if (a1.getName().equals(a2.getName())) {
+      if (compare(a1.getName(), a2.getName())) {
         result.add(s);
       }
     } else if (s instanceof RutaCondition && node instanceof RutaCondition) {
       RutaCondition c1 = (RutaCondition) node;
       RutaCondition c2 = (RutaCondition) s;
-      if (c1.getName().equals(c2.getName())) {
+      if (compare(c1.getName(), c2.getName())) {
         result.add(s);
       }
 
@@ -100,6 +102,23 @@ public class ReferenceFinder extends AST
     return super.visit(s);
   }
 
+  private boolean compare(String mention1, String mention2) {
+
+    return StringUtils.equals(reduce(mention1), reduce(mention2));
+  }
+
+  private String reduce(String mention) {
+    if (mention.indexOf('.') > 0) {
+      if (mention.endsWith("." + UIMAConstants.FEATURE_TYPE)
+              || mention.endsWith("." + UIMAConstants.FEATURE_COVERED_TEXT)
+              || mention.endsWith("." + UIMAConstants.FEATURE_COVERED_TEXT_SHORT)) {
+        int lastIndexOf = mention.lastIndexOf('.');
+        mention = mention.substring(0, lastIndexOf);
+      }
+    }
+    return mention;
+  }
+
   public List<ASTNode> getResult() {
     return result;
   }