--- a/DoWhatIMeanSupport.st	Mon Nov 25 19:44:15 2013 +0100
+++ b/DoWhatIMeanSupport.st	Wed Nov 27 01:14:43 2013 +0100
@@ -1159,7 +1159,18 @@
         language := languageOrNilArg
     ] ifFalse:[
         contextOrNilArg notNil ifTrue:[
-            language := contextOrNilArg method programmingLanguage
+            | method |
+
+            method := contextOrNilArg method.
+            method notNil ifTrue:[
+                language := method programmingLanguage
+            ] ifFalse:[
+                contextOrNilArg isJavaContext ifTrue:[
+                    language := JavaLanguage instance
+                ] ifFalse:[
+                    language := SmalltalkLanguage instance.
+                ].
+            ].
         ] ifFalse:[
             methodOrNilArg notNil ifTrue:[
                 language := methodOrNilArg programmingLanguage          
@@ -1186,6 +1197,7 @@
     self breakPoint: #jv.
 
     "Created: / 27-09-2013 / 10:21:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 26-11-2013 / 23:43:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 codeCompletionForLanguage: languageOrNil class: classOrNilArg context:contextOrNilArg codeView:codeViewArg
@@ -1612,6 +1624,7 @@
     ].
 ! !
 
+
 !DoWhatIMeanSupport methodsFor:'code completion-helpers'!
 
 askUserForCompletion:what for:codeView at:position from:allTheBest 
@@ -4623,10 +4636,10 @@
 !DoWhatIMeanSupport class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/DoWhatIMeanSupport.st,v 1.191 2013-11-06 15:41:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/DoWhatIMeanSupport.st,v 1.192 2013-11-27 00:14:43 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/DoWhatIMeanSupport.st,v 1.191 2013-11-06 15:41:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/DoWhatIMeanSupport.st,v 1.192 2013-11-27 00:14:43 vrany Exp $'
 ! !