Tools__NewSystemBrowser.st
changeset 17839 f46049188ece
parent 17836 68305bb1b979
child 17841 ebab2c97cef3
--- a/Tools__NewSystemBrowser.st	Tue Dec 05 15:47:08 2017 +0100
+++ b/Tools__NewSystemBrowser.st	Tue Dec 05 15:48:44 2017 +0100
@@ -245,6 +245,9 @@
 
     spec := super flyByHelpSpec addPairsFrom:#(
 
+#fuzzyClassNameSearch
+'If checked, a more powerful fuzzy string compare is used.\If not, a substring is searched.'
+
 #runLintOnClasses
 'Run static code analysis (lint) on the selected classes/protocols/methods'
 
@@ -342,7 +345,7 @@
 'Search class'
 
 #nameFilter
-'Show only methods with matching selectors / which contain the text.\The "-" filters hide matching methods'
+'Show only methods with matching selectors / which contain the text '
 
 #nameFilterType
 'Switch between selector- (S) and text matching (T)'
@@ -393,7 +396,7 @@
     ].
     ^ spec.
 
-    "Modified: / 04-12-2017 / 23:40:55 / cg"
+    "Modified: / 05-12-2017 / 12:52:42 / cg"
 ! !
 
 !NewSystemBrowser class methodsFor:'image specs'!
@@ -18910,7 +18913,18 @@
                                                     nm := nameList at:idx.
                                                     (nm asLowercase includesString:lcName caseSensitive:false)
                                                     or:[ (classList at:idx) name includesString:lcName caseSensitive:false]
-                                                ] thenCollect:[:idx | nameList at:idx].
+                                                ] 
+                                                thenCollect:[:idx | 
+                                                    |nm matchIdx|
+                                                    
+                                                    nm := nameList at:idx.
+                                                    matchIdx := nm asLowercase indexOfString:lcName.
+                                                    matchIdx ~~ 0 ifTrue:[
+                                                        nm := nm asText withColor:Color gray slightlyDarkened.
+                                                        nm emphasizeFrom:matchIdx to:matchIdx+lcName size-1 with:{ #color->Color black }
+                                                    ].
+                                                    nm
+                                                ].
                         ].
                         namesStarting := namesIncluding select:[:nm | nm asLowercase startsWith:lcName].
                         restList := (namesIncluding \ namesStarting).
@@ -18953,6 +18967,7 @@
         addSubView:(check := CheckBox label:(resources string:'Show Full Name (do not Strip off Namespace)') model:showFullNameHolder) before:nil.
     box panelView
         addSubView:(check := CheckBox label:(resources string:'Fuzzy Match (Instead of Substring Search)') model:doFuzzyMatchHolder) before:nil.
+    check helpKey:#fuzzyClassNameSearch.    
 
     doFuzzyMatchHolder onChangeEvaluate:updateList.   
     showFullNameHolder onChangeEvaluate:updateList.
@@ -18974,6 +18989,7 @@
     box listView origin:(0 @ check corner y).
 
     box extent:(400 @ 550).
+    box application:aBrowserOrNil.
     box open.
 
     className isEmptyOrNil ifTrue:[^ nil "cancel"].
@@ -19006,7 +19022,7 @@
     ^ className
 
     "Modified: / 04-09-2013 / 17:48:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 09-08-2017 / 23:56:38 / cg"
+    "Modified: / 05-12-2017 / 13:02:53 / cg"
 !
 
 enterBoxTitle:title okText:okText label:label
@@ -44629,7 +44645,7 @@
         branchName isEmptyOrNil ifTrue:[^ self].
     
         (tagAlreadyUsed := (knownTags includes:branchName)) ifTrue:[
-            Dialog inormation:'This tag/branchname is already known.\Please choose another name.'
+            Dialog information:'This tag/branchname is already known.\Please choose another name.'
         ].
         tagAlreadyUsed
     ] whileTrue.
@@ -44646,7 +44662,7 @@
     defClasses do:[:defClass |
         |packageId|
 
-        packageId := defClass asPackageId.
+        packageId := defClass package asPackageId.
         defClass forEachFileNameAndGeneratedContentsDo:[:fileName :fileContents |
             pathes add: (packageId pathRelativeToTopDirectory,'/',fileName).  "/ always unix names
         ].
@@ -44658,10 +44674,10 @@
     self projectMenuSetTag:baseTag usingManager:aManager.
 
     "/ check them onto the branch
-    self halt.
+    self projectMenuCheckInAllUsingManager:aManager onBranch:branchName
 
     "Created: / 04-12-2017 / 17:49:16 / cg"
-    "Modified: / 04-12-2017 / 19:07:01 / cg"
+    "Modified: / 05-12-2017 / 13:47:27 / cg"
 !
 
 projectMenuStartBranchUsingManagerNamed:sourceCodeManagerClassName