src/Pure/PIDE/document.scala

     val document: Document
     val node: Document.Node
     val is_outdated: Boolean
     def convert(offset: Int): Int
     def revert(offset: Int): Int
-    def state(command: Command): State
+    def state(command: Command): Command.State
   }
 
   object Change
   {
     val init = new Change(NO_ID, None, Nil, Future.value(Nil, Document.init))

         val document = stable.get.join_document
         val node = document.nodes(name)
         val is_outdated = !(pending_edits.isEmpty && latest == stable.get)
         def convert(offset: Int): Int = (offset /: edits)((i, edit) => edit.convert(i))
         def revert(offset: Int): Int = (offset /: reverse_edits)((i, edit) => edit.revert(i))
-        def state(command: Command): State = document.current_state(command)
+        def state(command: Command): Command.State = document.current_state(command)
       }
     }
   }
 
 

   {
     assignment.fulfill(tmp_states ++ new_states)
     tmp_states = Map()
   }
 
-  def current_state(cmd: Command): State =
+  def current_state(cmd: Command): Command.State =
   {
     require(assignment.is_finished)
     (assignment.join).get(cmd) match {
       case Some(cmd_state) => cmd_state.current_state
-      case None => new State(cmd, Command.Status.UNDEFINED, 0, Nil, cmd.empty_markup)
+      case None => new Command.State(cmd, Command.Status.UNDEFINED, 0, Nil, cmd.empty_markup)
     }
   }
 }