eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

First working prototype of eclipse plugin

Browse Source
This commit is contained in:
konsoletyper 2014-07-31 20:01:56 +04:00
parent 92ba9afee6
commit 930d2087ab
21 changed files with 397 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
teavm-core/src/main/java/org/teavm/parsing/Parser.java
View File

@ -64,9 +64,10 @@ public final class Parser {
FieldNode fieldNode = (FieldNode)obj;
cls.addField(parseField(fieldNode));
}
String fullFileName = node.name.substring(0, node.name.lastIndexOf('/') + 1) + node.sourceFile;
for (Object obj : node.methods) {
MethodNode methodNode = (MethodNode)obj;
cls.addMethod(parseMethod(methodNode, node.name, node.sourceFile));
cls.addMethod(parseMethod(methodNode, node.name, fullFileName));
}
if (node.outerClass != null) {
cls.setOwnerName(node.outerClass.replace('/', '.'));

1
teavm-eclipse/.gitignore → teavm-eclipse-plugin/.gitignore vendored
View File

@ -1,4 +1,5 @@
/.settings
/lib
/target
/.classpath
/.project

55
teavm-eclipse-plugin/META-INF/MANIFEST.MF Normal file
View File

@ -0,0 +1,55 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: TeaVM plugin for Eclipse
Bundle-SymbolicName: teavm-eclipse-plugin;singleton:=true
Bundle-Version: 0.2.0.SNAPSHOT
Bundle-Vendor: Alexey Andreev <konsoletyper@gmail.com>
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
org.eclipse.debug.core;bundle-version="3.8.0",
org.eclipse.debug.ui;bundle-version="3.9.0",
org.eclipse.swt;bundle-version="3.102.0",
org.eclipse.ui;bundle-version="3.105.0",
org.eclipse.jdt.debug;bundle-version="3.8.0",
org.eclipse.jdt.debug.ui;bundle-version="3.6.200",
org.eclipse.jdt.core;bundle-version="3.9.2",
org.eclipse.jdt.launching;bundle-version="3.7.1",
org.eclipse.ui.editors;bundle-version="3.8.100",
org.eclipse.ui.ide;bundle-version="3.9.0",
org.eclipse.jdt.ui;bundle-version="3.9.2"
Bundle-ClassPath: lib/asm-5.0.1.jar,
lib/asm-commons-5.0.1.jar,
lib/asm-debug-all-4.2.jar,
lib/asm-tree-5.0.1.jar,
lib/commons-io-2.4.jar,
lib/jackson-core-asl-1.9.13.jar,
lib/jackson-mapper-asl-1.9.13.jar,
lib/javax-websocket-client-impl-9.2.1.v20140609.jar,
lib/javax-websocket-server-impl-9.2.1.v20140609.jar,
lib/javax.annotation-api-1.2.jar,
lib/javax.servlet-api-3.1.0.jar,
lib/javax.websocket-api-1.0.jar,
lib/jetty-annotations-9.2.1.v20140609.jar,
lib/jetty-http-9.2.1.v20140609.jar,
lib/jetty-io-9.2.1.v20140609.jar,
lib/jetty-jndi-9.2.1.v20140609.jar,
lib/jetty-plus-9.2.1.v20140609.jar,
lib/jetty-security-9.2.1.v20140609.jar,
lib/jetty-server-9.2.1.v20140609.jar,
lib/jetty-servlet-9.2.1.v20140609.jar,
lib/jetty-util-9.2.1.v20140609.jar,
lib/jetty-webapp-9.2.1.v20140609.jar,
lib/jetty-xml-9.2.1.v20140609.jar,
lib/slf4j-api-1.7.7.jar,
lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar,
lib/teavm-core-0.2-SNAPSHOT.jar,
lib/websocket-api-9.2.1.v20140609.jar,
lib/websocket-client-9.2.1.v20140609.jar,
lib/websocket-common-9.2.1.v20140609.jar,
lib/websocket-server-9.2.1.v20140609.jar,
lib/websocket-servlet-9.2.1.v20140609.jar,
.,
lib/logback-classic-1.1.2.jar,
lib/logback-core-1.1.2.jar
Export-Package: org.teavm.eclipse.debugger,
org.teavm.eclipse.debugger.ui

44
teavm-eclipse-plugin/build.properties Normal file
View File

@ -0,0 +1,44 @@
source.. = src/main/java/
output.. = target/
bin.includes = plugin.xml,\
META-INF/,\
.,\
lib/asm-5.0.1.jar,\
lib/websocket-servlet-9.2.1.v20140609.jar,\
lib/websocket-server-9.2.1.v20140609.jar,\
lib/websocket-common-9.2.1.v20140609.jar,\
lib/websocket-client-9.2.1.v20140609.jar,\
lib/websocket-api-9.2.1.v20140609.jar,\
lib/teavm-core-0.2-SNAPSHOT.jar,\
lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar,\
lib/slf4j-api-1.7.7.jar,\
lib/jetty-xml-9.2.1.v20140609.jar,\
lib/jetty-webapp-9.2.1.v20140609.jar,\
lib/jetty-util-9.2.1.v20140609.jar,\
lib/jetty-servlet-9.2.1.v20140609.jar,\
lib/jetty-server-9.2.1.v20140609.jar,\
lib/jetty-security-9.2.1.v20140609.jar,\
lib/jetty-plus-9.2.1.v20140609.jar,\
lib/jetty-jndi-9.2.1.v20140609.jar,\
lib/jetty-io-9.2.1.v20140609.jar,\
lib/jetty-http-9.2.1.v20140609.jar,\
lib/jetty-annotations-9.2.1.v20140609.jar,\
lib/javax.websocket-api-1.0.jar,\
lib/javax.servlet-api-3.1.0.jar,\
lib/javax.annotation-api-1.2.jar,\
lib/javax-websocket-server-impl-9.2.1.v20140609.jar,\
lib/javax-websocket-client-impl-9.2.1.v20140609.jar,\
lib/jackson-mapper-asl-1.9.13.jar,\
lib/jackson-core-asl-1.9.13.jar,\
lib/commons-io-2.4.jar,\
lib/asm-tree-5.0.1.jar,\
lib/asm-debug-all-4.2.jar,\
lib/asm-commons-5.0.1.jar,\
logback.xml,\
lib/logback-core-1.1.2.jar,\
lib/logback-classic-1.1.2.jar
source.lib/teavm-core-0.2-SNAPSHOT.jar =
jars.compile.order = .,\
lib/teavm-core-0.2-SNAPSHOT.jar,\
lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar
source.lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar =

10
teavm-eclipse-plugin/logback.xml Normal file
View File

@ -0,0 +1,10 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="info">
<appender-ref ref="STDOUT" />
</root>
</configuration>

15
teavm-eclipse/src/main/resources/plugin.xml → teavm-eclipse-plugin/plugin.xml
View File

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<plugin id="org.teavm.eclipse" version="0.2" name="TeaVM plugin" class="org.teavm.eclipse.TeaVMEclipsePlugin">
<plugin>
<extension point="org.eclipse.debug.core.launchConfigurationTypes">
<launchConfigurationType
sourceLocatorId="org.teavm.eclipse.debugger.sourceLookup"
name="TeaVM remote"
sourcePathComputerId="org.teavm.eclipse.debugger.sourcePath"
delegate="org.teavm.eclipse.debugger.TeaVMLaunchConfigurationDelegate"
modes="debug"
id="org.teavm.eclipse.debugger.launchConfig">
@ -17,6 +18,12 @@
id="org.teavm.eclipse.debugger.sourceLookup">
</sourceLocator>
</extension>
<extension point="org.eclipse.debug.core.sourcePathComputers">
<sourcePathComputer
class="org.teavm.eclipse.debugger.TeaVMSourcePathComputerDelegate"
id="org.teavm.eclipse.debugger.sourcePath">
</sourcePathComputer>
</extension>
<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
<launchConfigurationTabGroup
type="org.teavm.eclipse.debugger.launchConfig"
@ -25,4 +32,10 @@
id="org.teavm.eclipse.debugger.ui.tabs">
</launchConfigurationTabGroup>
</extension>
<extension point="org.eclipse.debug.ui.debugModelPresentations">
<debugModelPresentation
class="org.teavm.eclipse.debugger.TeaVMDebugModelPresentation"
id="org.teavm.eclipse.debugger.thread">
</debugModelPresentation>
</extension>
</plugin>

29
teavm-eclipse/pom.xml → teavm-eclipse-plugin/pom.xml
View File

@ -11,13 +11,6 @@
<artifactId>teavm-eclipse</artifactId>
<packaging>bundle</packaging>
<repositories>
<repository>
<id>swt-repo</id>
<url>https://swt-repo.googlecode.com/svn/repo/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.teavm</groupId>
@ -30,14 +23,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>runtime</artifactId>
<version>3.9.100-v20131218-1515</version>
</dependency>
<dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
<version>4.2.2</version>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
</dependency>
</dependencies>
@ -54,6 +42,17 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<goals>
<goal>dependency:copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/lib</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>

0
teavm-eclipse/src/main/java/org/teavm/eclipse/TeaVMEclipsePlugin.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMEclipsePlugin.java
View File

52
teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugModelPresentation.java Normal file
View File

@ -0,0 +1,52 @@
package org.teavm.eclipse.debugger;
import org.eclipse.core.resources.IFile;
import org.eclipse.debug.core.model.ILineBreakpoint;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.ui.IDebugModelPresentation;
import org.eclipse.debug.ui.IValueDetailListener;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
/**
*
* @author Alexey Andreev <konsoletyper@gmail.com>
*/
public class TeaVMDebugModelPresentation extends LabelProvider implements IDebugModelPresentation {
@Override
public String getEditorId(IEditorInput input, Object element) {
if (element instanceof IFile || element instanceof ILineBreakpoint) {
return JavaUI.ID_CU_EDITOR;
}
return null;
}
@Override
public IEditorInput getEditorInput(Object element) {
if (element instanceof IFile) {
return new FileEditorInput((IFile)element);
}
if (element instanceof ILineBreakpoint) {
return new FileEditorInput((IFile)((ILineBreakpoint)element).getMarker().getResource());
}
return null;
}
@Override
public void computeDetail(IValue arg0, IValueDetailListener arg1) {
}
@Override
public void setAttribute(String arg0, Object arg1) {
}
@Override
public String getText(Object element) {
if (element instanceof TeaVMStackFrame) {
return ((TeaVMStackFrame)element).getName();
}
return super.getText(element);
}
}

0
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugProcess.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugProcess.java
View File

90
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugTarget.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugTarget.java
View File

@ -2,19 +2,14 @@ package org.teavm.eclipse.debugger;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IMarkerDelta;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.debug.core.model.IMemoryBlock;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.debug.core.model.IThread;
import org.eclipse.debug.core.model.*;
import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
import org.teavm.chromerdp.ChromeRDPServer;
import org.teavm.debugging.Breakpoint;
import org.teavm.debugging.Debugger;
@ -25,12 +20,13 @@ import org.teavm.debugging.DebuggerListener;
* @author Alexey Andreev <konsoletyper@gmail.com>
*/
@SuppressWarnings("rawtypes")
public class TeaVMDebugTarget implements IDebugTarget {
public class TeaVMDebugTarget implements IDebugTarget, IStep {
ILaunch launch;
Debugger teavmDebugger;
private ChromeRDPServer server;
private boolean terminated;
private TeaVMDebugProcess process;
private TeaVMThread thread;
Map<IBreakpoint, Breakpoint> breakpointMap = new HashMap<>();
Map<Breakpoint, IBreakpoint> breakpointBackMap = new HashMap<>();
@ -39,6 +35,11 @@ public class TeaVMDebugTarget implements IDebugTarget {
this.teavmDebugger = teavmDebugger;
this.server = server;
this.process = new TeaVMDebugProcess(launch);
this.thread = new TeaVMThread(this);
DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this);
for (IBreakpoint breakpoint : DebugPlugin.getDefault().getBreakpointManager().getBreakpoints()) {
breakpointAdded(breakpoint);
}
teavmDebugger.addListener(new DebuggerListener() {
@Override
public void resumed() {
@ -88,6 +89,7 @@ public class TeaVMDebugTarget implements IDebugTarget {
public void terminate() throws DebugException {
terminated = true;
server.stop();
fireEvent(new DebugEvent(this, DebugEvent.TERMINATE));
}
@Override
@ -98,25 +100,25 @@ public class TeaVMDebugTarget implements IDebugTarget {
@Override
public void breakpointAdded(IBreakpoint breakpoint) {
try {
breakpoint.setRegistered(true);
int line = breakpoint.getMarker().getAttribute(IMarker.LINE_NUMBER, 1);
String fileName = getRelativePath(breakpoint.getMarker().getResource());
teavmDebugger.createBreakpoint(fileName, line);
if (breakpoint instanceof IJavaLineBreakpoint) {
IJavaLineBreakpoint lineBreakpoint = (IJavaLineBreakpoint)breakpoint;
String fileName = lineBreakpoint.getTypeName().replace('.', '/') + ".java";
Breakpoint teavmBreakpoint = teavmDebugger.createBreakpoint(fileName, lineBreakpoint.getLineNumber());
breakpointMap.put(lineBreakpoint, teavmBreakpoint);
breakpointBackMap.put(teavmBreakpoint, lineBreakpoint);
breakpoint.setRegistered(true);
} else {
breakpoint.setRegistered(false);
}
} catch (CoreException e) {
throw new RuntimeException(e);
}
}
private String getRelativePath(IResource resource) {
if ((resource.getType() & IResource.PROJECT) != 0 ||
(resource.getType() & IResource.VIRTUAL) != 0) {
return "";
}
return getRelativePath(resource.getParent()) + "/" + resource.getName();
}
@Override
public void breakpointChanged(IBreakpoint arg0, IMarkerDelta arg1) {
public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta markerDelta) {
breakpointRemoved(breakpoint, markerDelta);
breakpointAdded(breakpoint);
}
@Override
@ -189,7 +191,7 @@ public class TeaVMDebugTarget implements IDebugTarget {
@Override
public boolean isDisconnected() {
return teavmDebugger.isAttached();
return !teavmDebugger.isAttached();
}
@Override
@ -204,7 +206,7 @@ public class TeaVMDebugTarget implements IDebugTarget {
@Override
public IThread[] getThreads() throws DebugException {
return null;
return new IThread[] { thread };
}
@Override
@ -214,11 +216,41 @@ public class TeaVMDebugTarget implements IDebugTarget {
@Override
public boolean supportsBreakpoint(IBreakpoint breakpoint) {
try {
return breakpoint.getMarker().getAttribute(IMarker.LINE_NUMBER) != null;
} catch (CoreException e) {
// TODO: Log this exception
return false;
}
return breakpoint instanceof IJavaLineBreakpoint;
}
@Override
public boolean canStepInto() {
return true;
}
@Override
public boolean canStepOver() {
return true;
}
@Override
public boolean canStepReturn() {
return true;
}
@Override
public boolean isStepping() {
return false;
}
@Override
public void stepInto() throws DebugException {
thread.stepInto();
}
@Override
public void stepOver() throws DebugException {
thread.stepOver();
}
@Override
public void stepReturn() throws DebugException {
thread.stepReturn();
}
}

35
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/TeaVMLaunchConfigurationDelegate.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMLaunchConfigurationDelegate.java
View File

@ -9,7 +9,7 @@ import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
import org.teavm.chromerdp.*;
import org.teavm.debugging.Debugger;
import org.teavm.debugging.URLDebugInformationProvider;
@ -26,14 +26,17 @@ public class TeaVMLaunchConfigurationDelegate implements ILaunchConfigurationDel
throw new IllegalArgumentException("Only debug mode supported");
}
int port = configuration.getAttribute("teavm-debugger-port", 2357);
ChromeRDPServer server = new ChromeRDPServer();
final ChromeRDPServer server = new ChromeRDPServer();
server.setPort(port);
ChromeRDPDebugger jsDebugger = new ChromeRDPDebugger();
server.setExchangeConsumer(new SynchronousMessageExchange(jsDebugger));
Debugger debugger = new Debugger(jsDebugger, new URLDebugInformationProvider(""));
server.start();
new Thread() {
@Override public void run() {
server.start();
}
}.start();
launch.addDebugTarget(new TeaVMDebugTarget(launch, debugger, server));
monitor.done();
}
private static class SynchronousMessageExchange implements ChromeRDPExchangeConsumer,
@ -52,17 +55,21 @@ public class TeaVMLaunchConfigurationDelegate implements ILaunchConfigurationDel
debugger.setExchange(this);
exchange.addListener(new ChromeRDPExchangeListener() {
@Override public void received(final String message) throws IOException {
Display.getCurrent().asyncExec(new Runnable() {
@Override public void run() {
try {
for (ChromeRDPExchangeListener listener : listeners) {
listener.received(message);
}
} catch (IOException e) {
// TODO: add logging
}
postToUIThread(message);
}
});
}
private void postToUIThread(final String message) {
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
@Override public void run() {
try {
for (ChromeRDPExchangeListener listener : listeners) {
listener.received(message);
}
});
} catch (IOException e) {
// TODO: add logging
}
}
});
}

0
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupDirector.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupDirector.java
View File

10
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupParticipant.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourceLookupParticipant.java
View File

@ -11,11 +11,11 @@ import org.teavm.debugging.SourceLocation;
public class TeaVMSourceLookupParticipant extends AbstractSourceLookupParticipant {
@Override
public String getSourceName(Object object) throws CoreException {
if (object instanceof TeaVMStackFrame) {
TeaVMStackFrame stackFrame = (TeaVMStackFrame)object;
SourceLocation location = stackFrame.callFrame.getLocation();
return location != null ? location.getFileName() : null;
if (!(object instanceof TeaVMStackFrame)) {
return null;
}
return null;
TeaVMStackFrame stackFrame = (TeaVMStackFrame)object;
SourceLocation location = stackFrame.callFrame.getLocation();
return location != null ? location.getFileName() : null;
}
}

43
teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMSourcePathComputerDelegate.java Normal file
View File

@ -0,0 +1,43 @@
package org.teavm.eclipse.debugger;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.sourcelookup.ISourceContainer;
import org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate;
import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
/**
*
* @author Alexey Andreev <konsoletyper@gmail.com>
*/
public class TeaVMSourcePathComputerDelegate implements ISourcePathComputerDelegate {
@Override
public ISourceContainer[] computeSourceContainers(ILaunchConfiguration config, IProgressMonitor monitor)
throws CoreException {
List<ISourceContainer> sourceContainers = new ArrayList<>();
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
for (IProject project : projects) {
if (!project.isOpen()) {
continue;
}
if (project.hasNature(JavaCore.NATURE_ID)) {
IJavaProject javaProject = JavaCore.create(project);
for (IPackageFragmentRoot fragmentRoot : javaProject.getAllPackageFragmentRoots()) {
if (fragmentRoot.getResource() instanceof IFolder) {
sourceContainers.add(new FolderSourceContainer((IFolder)fragmentRoot.getResource(), true));
}
}
}
}
return sourceContainers.toArray(new ISourceContainer[0]);
}
}

33
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/TeaVMStackFrame.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStackFrame.java
View File

@ -2,11 +2,7 @@ package org.teavm.eclipse.debugger;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.debug.core.model.IRegisterGroup;
import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.debug.core.model.IThread;
import org.eclipse.debug.core.model.IVariable;
import org.eclipse.debug.core.model.*;
import org.teavm.debugging.CallFrame;
/**
@ -43,17 +39,17 @@ public class TeaVMStackFrame implements IStackFrame {
@Override
public boolean canStepInto() {
return false;
return thread.getTopStackFrame() == this;
}
@Override
public boolean canStepOver() {
return false;
return thread.getTopStackFrame() == this;
}
@Override
public boolean canStepReturn() {
return false;
return thread.getTopStackFrame() == this;
}
@Override
@ -63,14 +59,17 @@ public class TeaVMStackFrame implements IStackFrame {
@Override
public void stepInto() throws DebugException {
thread.stepInto();
}
@Override
public void stepOver() throws DebugException {
thread.stepOver();
}
@Override
public void stepReturn() throws DebugException {
thread.stepReturn();
}
@Override
@ -80,20 +79,22 @@ public class TeaVMStackFrame implements IStackFrame {
@Override
public boolean canSuspend() {
return false;
return thread.getTopStackFrame() == this;
}
@Override
public boolean isSuspended() {
return false;
return thread.isSuspended();
}
@Override
public void resume() throws DebugException {
thread.resume();
}
@Override
public void suspend() throws DebugException {
thread.suspend();
}
@Override
@ -108,7 +109,7 @@ public class TeaVMStackFrame implements IStackFrame {
@Override
public String getModelIdentifier() {
return thread.getModelIdentifier();
return thread.getModelIdentifier() + ".thread";
}
@Override
@ -127,8 +128,14 @@ public class TeaVMStackFrame implements IStackFrame {
}
@Override
public String getName() throws DebugException {
return callFrame.getLocation() != null ? callFrame.getLocation().getFileName() : "unknown";
public String getName() {
StringBuilder sb = new StringBuilder();
String fileName = callFrame.getLocation() != null ? callFrame.getLocation().getFileName() : null;
sb.append(fileName != null ? fileName : "unknown");
if (callFrame.getLocation() != null) {
sb.append(":").append(callFrame.getLocation().getLine());
}
return sb.toString();
}
@Override

0
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamMonitor.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamMonitor.java
View File

0
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamsProxy.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMStreamsProxy.java
View File

59
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/TeaVMThread.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMThread.java
View File

@ -1,12 +1,17 @@
package org.teavm.eclipse.debugger;
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.debug.core.model.IThread;
import org.teavm.debugging.Breakpoint;
import org.teavm.debugging.CallFrame;
import org.teavm.debugging.Debugger;
import org.teavm.debugging.DebuggerListener;
/**
*
@ -15,10 +20,52 @@ import org.teavm.debugging.Debugger;
public class TeaVMThread implements IThread {
private Debugger teavmDebugger;
private TeaVMDebugTarget debugTarget;
private TeaVMStackFrame[] stackTrace;
public TeaVMThread(TeaVMDebugTarget debugTarget) {
this.debugTarget = debugTarget;
this.teavmDebugger = debugTarget.teavmDebugger;
this.teavmDebugger.addListener(new DebuggerListener() {
@Override
public void resumed() {
updateStackTrace();
}
@Override
public void paused() {
updateStackTrace();
}
@Override
public void detached() {
}
@Override
public void breakpointStatusChanged(Breakpoint breakpoint) {
}
@Override
public void attached() {
}
});
}
private void updateStackTrace() {
if (teavmDebugger.getCallStack() == null) {
stackTrace = null;
} else {
CallFrame[] teavmCallStack = teavmDebugger.getCallStack();
stackTrace = new TeaVMStackFrame[teavmCallStack.length];
for (int i = 0; i < teavmCallStack.length; ++i) {
CallFrame teavmFrame = teavmCallStack[i];
stackTrace[i] = new TeaVMStackFrame(this, teavmFrame);
}
}
fireEvent(new DebugEvent(this, DebugEvent.CHANGE));
}
private void fireEvent(DebugEvent event) {
DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[] { event });
}
@Override
@ -43,12 +90,12 @@ public class TeaVMThread implements IThread {
@Override
public boolean canResume() {
return false;
return true;
}
@Override
public boolean canSuspend() {
return false;
return true;
}
@Override
@ -58,10 +105,12 @@ public class TeaVMThread implements IThread {
@Override
public void resume() throws DebugException {
teavmDebugger.resume();
}
@Override
public void suspend() throws DebugException {
teavmDebugger.suspend();
}
@Override
@ -131,12 +180,12 @@ public class TeaVMThread implements IThread {
@Override
public IStackFrame[] getStackFrames() throws DebugException {
return null;
return stackTrace != null ? stackTrace.clone() : new IStackFrame[0];
}
@Override
public IStackFrame getTopStackFrame() throws DebugException {
return null;
public IStackFrame getTopStackFrame() {
return stackTrace != null && stackTrace.length > 0 ? stackTrace[0] : null;
}
@Override

2
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTab.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTab.java
View File

@ -43,7 +43,7 @@ public class TeaVMTab extends AbstractLaunchConfigurationTab {
@Override
public String getName() {
return null;
return "TeaVM";
}
@Override

0
teavm-eclipse/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTabGroup.java → teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/ui/TeaVMTabGroup.java
View File