2 files changed, 7 insertions, 18 deletions
diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerRunner.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerRunner.java
index f573f9442e64..5fb6888ec1e2 100644
--- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerRunner.java
+++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerRunner.java
@@ -8,7 +8,6 @@ import com.intellij.execution.runners.DefaultProgramRunner;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
-import com.intellij.openapi.project.Project;
 import com.intellij.xdebugger.XDebugProcess;
 import com.intellij.xdebugger.XDebugProcessStarter;
 import com.intellij.xdebugger.XDebugSession;
@@ -19,11 +18,6 @@ import org.intellij.plugins.xsltDebugger.impl.XsltDebugProcess;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
-/*
-* Created by IntelliJ IDEA.
-* User: sweinreuter
-* Date: 16.11.10
-*/
 public class XsltDebuggerRunner extends DefaultProgramRunner {
   static final ThreadLocal<Boolean> ACTIVE = new ThreadLocal<Boolean>();
 
@@ -43,26 +37,20 @@ public class XsltDebuggerRunner extends DefaultProgramRunner {
   }
 
   @Override
-  protected RunContentDescriptor doExecute(@NotNull Project project,
-                                           @NotNull RunProfileState state,
-                                           RunContentDescriptor contentToReuse,
-                                           @NotNull ExecutionEnvironment env) throws ExecutionException {
+  protected RunContentDescriptor doExecute(@NotNull RunProfileState state, @NotNull ExecutionEnvironment env) throws ExecutionException {
     FileDocumentManager.getInstance().saveAllDocuments();
-    return createContentDescriptor(project, state, contentToReuse, env);
+    return createContentDescriptor(state, env);
   }
 
-  protected RunContentDescriptor createContentDescriptor(Project project,
-                                                         final RunProfileState runProfileState,
-                                                         RunContentDescriptor contentToReuse,
-                                                         final ExecutionEnvironment executionEnvironment) throws ExecutionException {
+  protected RunContentDescriptor createContentDescriptor(final RunProfileState runProfileState, final ExecutionEnvironment environment) throws ExecutionException {
     final XDebugSession debugSession =
-      XDebuggerManager.getInstance(project).startSession(this, executionEnvironment, contentToReuse, new XDebugProcessStarter() {
+      XDebuggerManager.getInstance(environment.getProject()).startSession(environment, new XDebugProcessStarter() {
         @NotNull
         public XDebugProcess start(@NotNull final XDebugSession session) throws ExecutionException {
           ACTIVE.set(Boolean.TRUE);
           try {
             final XsltCommandLineState c = (XsltCommandLineState)runProfileState;
-            final ExecutionResult result = runProfileState.execute(executionEnvironment.getExecutor(), XsltDebuggerRunner.this);
+            final ExecutionResult result = runProfileState.execute(environment.getExecutor(), XsltDebuggerRunner.this);
             return new XsltDebugProcess(session, result, c.getExtensionData().getUserData(XsltDebuggerExtension.VERSION));
           } finally {
             ACTIVE.remove();
diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltExecutionStack.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltExecutionStack.java
index 3f57574e175c..42d706ae927c 100644
--- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltExecutionStack.java
+++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltExecutionStack.java
@@ -31,6 +31,7 @@ public class XsltExecutionStack extends XExecutionStack {
       if (myDebuggerSession.getCurrentState() == Debugger.State.SUSPENDED) {
         Debugger.Frame frame = myTopFrame.getFrame();
         final List<XStackFrame> frames = new ArrayList<XStackFrame>();
+        frames.add(myTopFrame);
         while (frame != null) {
           frame = frame.getPrevious();
           if (frame != null) {
@@ -38,7 +39,7 @@ public class XsltExecutionStack extends XExecutionStack {
           }
         }
         if (firstFrameIndex <= frames.size()) {
-          container.addStackFrames(frames.subList(firstFrameIndex - 1, frames.size()), true);
+          container.addStackFrames(frames.subList(firstFrameIndex, frames.size()), true);
         } else {
           container.addStackFrames(Collections.<XStackFrame>emptyList(), true);
         }