Index: src/org/netbeans/modules/languages/features/CompletionProviderImpl.java
===================================================================
RCS file: /cvs/languages/engine/src/org/netbeans/modules/languages/features/CompletionProviderImpl.java,v
--- src/org/netbeans/modules/languages/features/CompletionProviderImpl.java		1.16
+++ src/org/netbeans/modules/languages/features/CompletionProviderImpl.java	
@@ -117,1 +117,0 @@ 
-            //S ystem.out.println("CodeCompletion: refresh " + resultSet);
@@ -120,0 +119,9 @@ 
+            doc = component.getDocument ();
+            TokenHierarchy tokenHierarchy = TokenHierarchy.get (doc);
+            TokenSequence tokenSequence = tokenHierarchy.tokenSequence ();
+            int offset = component.getCaret ().getDot ();
+            refresh (tokenSequence, offset, resultSet);
+            resultSet.finish();
+        }
+        
+        private void refresh (TokenSequence tokenSequence, int offset, CompletionResultSet resultSet) {
@@ -121,3 +129,4 @@ 
-                TokenHierarchy tokenHierarchy = TokenHierarchy.get (doc);
-                TokenSequence tokenSequence = tokenHierarchy.tokenSequence ();
-                int offset = component.getCaret ().getDot ();
---
+                if (tokenSequence == null) {
+                    return;
+                }
+                
@@ -126,1 +135,0 @@ 
-                    resultSet.finish ();
@@ -139,1 +147,0 @@ 
-                    resultSet.finish ();
@@ -155,1 +162,3 @@ 
-                resultSet.finish ();
---
+                if(feature == null) {
+                    refresh(tokenSequence.embedded(), offset, resultSet);
+                }