--- a/Workspace.st	Wed Sep 18 15:22:56 2013 +0200
+++ b/Workspace.st	Wed Sep 18 15:23:11 2013 +0200
@@ -16,7 +16,7 @@
 		commentStrings autoDefineWorkspaceVariables simulatedSelf
 		autoDefineVariables compilerClass allowValueDrop
 		poolsConsideredInDoIts namespaceForDoits editedMethodOrClass
-		editedClass editedMethod'
+		editedClass editedMethod editedLanguage'
 	classVariableNames:'DefaultViewBackground DefaultErrorForegroundColor
 		DefaultErrorBackgroundColor DefaultWarningBackgroundColor
 		DefaultWarningForegroundColor WorkspaceVariables DoItHistory
@@ -559,6 +559,25 @@
     ^ editedMethodOrClass isBehavior ifTrue:[editedMethodOrClass] ifFalse:[editedMethodOrClass mclass]
 !
 
+editedLanguage
+    editedLanguage notNil ifTrue:[
+        ^ editedLanguage
+    ].
+    editedMethod notNil ifTrue:[
+        ^ editedMethod programmingLanguage.
+    ].
+    editedClass notNil ifTrue:[
+        editedClass programmingLanguage.
+    ].
+    ^ nil
+
+    "Modified: / 18-09-2013 / 12:58:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+editedLanguage:aProgrammingLanguageOrNil
+    editedLanguage := aProgrammingLanguageOrNil.
+!
+
 editedMethod
     "for the code completion"
 
@@ -2367,7 +2386,8 @@
             UserInformation ignoreIn:[
                 anyFound := false.
                 DoWhatIMeanSupport 
-                    codeCompletionForMethod:editView editedMethod
+                    codeCompletionForLanguage: editView editedLanguage
+                    method:editView editedMethod
                     orClass:editView editedClass 
                     context:nil 
                     codeView:editView 
@@ -2388,6 +2408,8 @@
                 for:self
                 withArguments:{suggestions . implementations . actions . autoSelect }
         ] forkAt:(Processor activePriority - 1).
+
+    "Modified: / 18-09-2013 / 14:17:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 stopCompletionProcess
@@ -2577,10 +2599,10 @@
 !Workspace class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.305 2013-09-15 12:36:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.306 2013-09-18 13:23:11 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.305 2013-09-15 12:36:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.306 2013-09-18 13:23:11 vrany Exp $'
 ! !