1

archimatetool · Jan 17, 2025 · 0a05cc8 · 0a05cc8
1 parent bff2fd8
commit 0a05cc8
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/search/SearchFilter.java b/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/search/SearchFilter.java
@@ -7,6 +7,8 @@
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -136,7 +138,8 @@ private boolean shouldShowObjectWithName(Object element) {
             // Normalise in case of multi-line text
             name = StringUtils.normaliseNewLineCharacters(name);
 
-            return name.toLowerCase().contains(fSearchText.toLowerCase());
+            //return name.toLowerCase().contains(fSearchText.toLowerCase());
+            return matchesRegexString(name);
         }
 
         return false;
@@ -177,6 +180,17 @@ private boolean shouldShowProperty(Object element) {
 
         return false;
     }
+
+    private boolean matchesRegexString(String searchString) {
+        try {
+            Pattern pattern = Pattern.compile(fSearchText, Pattern.CASE_INSENSITIVE);
+            Matcher matcher = pattern.matcher(searchString);
+            return matcher.find();
+        }
+        catch(Exception ex) {
+           return false;
+        }
+    }
 
     public boolean isFiltering() {
         return isFilteringName() || isFilteringDocumentation() || isFilteringConcepts() || isFilteringPropertyKeys() || isFilteringSpecializations() || isFilteringViews();