1. Sergey Kolos
  2. lispdev

Commits

sk  committed 4c2880e

- Fixed bug: stack frames were not removed after restart
- Added tooltip to Debug view to show details of condition. Assumes one thread?

  • Participants
  • Parent commits 7c48c9d
  • Branches default

Comments (0)

Files changed (2)

File src/org/lispdev/swank/LispImplementation.java

View file
  • Ignore whitespace
       return null;
     }
     DebugInfo res = new DebugInfo(debugInfo.get(1).value,
-        debugInfo.get(2).asInt(),
-        debugInfo.get(3).get(0).value + "\n" + debugInfo.get(3).get(1).value);
+        debugInfo.get(2).asInt(),debugInfo.get(3).get(1).value.trim(),
+        debugInfo.get(3).get(0).value);
     if( res.condition == null || res.thread == null )
     {
       Log.logError("Debug info does not have correct structure: "+

File src/org/lispdev/swank/runnables/SwankDebugRunnable.java

View file
  • Ignore whitespace
      * the condition to debug
      */
     public final String condition;
+    public final String description;
     public final List<SwankDebugRestart> restarts =
       new ArrayList<SwankDebugRestart>();
     public final List<String> frames = new ArrayList<String>();
 
-    public DebugInfo(String thread, int lvl, String condition)
+    public DebugInfo(String thread, int lvl, String condition,
+        String description)
     {
       this.thread = thread;
       level = lvl;
       this.condition = condition;
+      this.description = description;
     }
 
     public void addRestart(String name, String description)
         if( other.condition != null ) return false;
       }
       else if( !condition.equals(other.condition) ) return false;
+      if( description == null )
+      {
+        if( other.description != null ) return false;
+      }
+      else if( !description.equals(other.description) ) return false;
       if( level != other.level ) return false;
       if( thread == null )
       {