Merge jv
authorMerge Script
Tue, 10 May 2016 06:50:22 +0200
branchjv
changeset 5091 5d1a9c80d511
parent 5087 196ee1a96ae6 (current diff)
parent 5090 c68614848447 (diff)
child 5097 5fbbb3dbef78
Merge
AssistantApplication.st
DoWhatIMeanSupport.st
--- a/AssistantApplication.st	Mon May 09 06:39:05 2016 +0200
+++ b/AssistantApplication.st	Tue May 10 06:50:22 2016 +0200
@@ -669,7 +669,7 @@
                             image2:(self class leftArrowIcon)
                     ] ifFalse:[
                         (self isPageEnabledAtIndex:index) ifFalse:[
-                            entry colorizeAllWith:(Button defaultDisabledForegroundColor) "Color grey".
+                            entry withColor:(Button defaultDisabledForegroundColor) "Color grey".
                         ] ifTrue:[
                             entry
                         ].
--- a/DoWhatIMeanSupport.st	Mon May 09 06:39:05 2016 +0200
+++ b/DoWhatIMeanSupport.st	Tue May 10 06:50:22 2016 +0200
@@ -2979,9 +2979,9 @@
         argNames := (namesByCount collect:[:a | a key]).
         argNames do:[:eachArgName |
             selectors add:('%1 %2 %3' 
-                            bindWith:(selectorSoFar colorizeAllWith:Color darkGrey) 
+                            bindWith:(selectorSoFar withColor:Color darkGrey) 
                             with:eachArgName
-                            with:('(argument)' allItalic colorizeAllWith:Color darkGrey)).
+                            with:('(argument)' allItalic withColor:Color darkGrey)).
         ].
         
         editActionForArg :=
@@ -3594,21 +3594,21 @@
 
                     val isBehavior ifTrue:[
                         val isLoaded ifFalse:[
-                            eachName,' ( ', ('autoloaded class in ',(val category ? 'unknown category')) allItalic,' )'
+                            eachName,' (= ', ('autoloaded class in ',(val category ? 'unknown category')) allItalic,' )'
                         ] ifTrue:[
                             val isNameSpace ifTrue:[
                                 eachName,' ( ', 'namespace' allItalic,' )'
                             ] ifFalse:[
-                                eachName,' ( ', ('class in ',(val category ? 'unknown category')) allItalic,' )'
+                                eachName,' (= ', ('class in ',(val category ? 'unknown category')) allItalic,' )'
                             ]
                         ]
                     ] ifFalse:[
                         "/ Parser findBest:30 selectorsFor:'isLite' in:nil forCompletion:true
 
                         (val isLiteral and:[ (printString := val printString) size < 15 ]) ifTrue:[
-                            eachName,' ( ',printString allItalic,' )'
+                            eachName,' (= ',printString allItalic,' )'
                         ] ifFalse:[
-                            eachName,' ( ',val classNameWithArticle allItalic,' )'
+                            eachName,' (= ',val classNameWithArticle allItalic,' )'
                         ].
                     ].
                 ].
@@ -5101,7 +5101,7 @@
      it is a good idea to know what the reveiver's value is.
      Sigh - returns nil as value both if unknown AND if a real nil is there"
 
-    |nodeVal con privateClass pool|
+    |nodeVal con privateClass pool sym|
 
     aVariableName isUppercaseFirst ifTrue:[
         classOrNil notNil ifTrue:[
@@ -5120,9 +5120,9 @@
                 ^ { nodeVal . #poolVariable }
             ].
         ].
-        aVariableName knownAsSymbol ifTrue:[
-            nodeVal := Smalltalk at:aVariableName asSymbol.
-            nodeVal notNil ifTrue:[     
+        (sym := aVariableName asSymbolIfInterned) notNil ifTrue:[
+            nodeVal := Smalltalk at:sym.
+            (nodeVal notNil or:[Smalltalk includesKey:sym]) ifTrue:[     
                 ^ { nodeVal . #global }
             ]
         ].