Tools__TagList.st
changeset 14564 f5d99c77f217
parent 14538 afb944cb7612
child 14579 3c1230b28239
--- a/Tools__TagList.st	Wed Jul 02 14:54:07 2014 +0200
+++ b/Tools__TagList.st	Wed Jul 02 14:54:15 2014 +0200
@@ -1587,15 +1587,26 @@
 !TagList methodsFor:'private'!
 
 applyFilterToList:aList
-    |lcFilter|
-
-    filter includesMatchCharacters ifTrue:[
-        lcFilter := filter asLowercase.
-        ^ aList select:[:tag | lcFilter match:tag label caseSensitive:false]
+    |filters|
+
+    filters := filter splitByAny:',;'.
+    filters size == 1 ifTrue:[
+        filter includesMatchCharacters ifFalse:[
+            ^ aList select:[:tag | tag label includesString:filter caseSensitive:false]
+        ].
     ].
-    ^ aList select:[:tag | tag label includesString:filter caseSensitive:false]
-
-    "Modified: / 01-08-2012 / 16:52:02 / cg"
+
+    ^ aList 
+        select:[:tag |
+            filters 
+                contains:[:someFilter |
+                    someFilter includesMatchCharacters ifTrue:[
+                        someFilter match:tag label caseSensitive:false
+                    ] ifFalse:[
+                        tag label includesString:someFilter caseSensitive:false
+                    ].
+                ].
+        ].
 !
 
 getCtagsVersion
@@ -3929,14 +3940,14 @@
 !TagList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.59 2014-06-23 09:39:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.60 2014-07-02 12:54:15 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.59 2014-06-23 09:39:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.60 2014-07-02 12:54:15 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__TagList.st,v 1.59 2014-06-23 09:39:42 cg Exp $'
+    ^ '$Id: Tools__TagList.st,v 1.60 2014-07-02 12:54:15 cg Exp $'
 ! !