Skip to content

Commit 9a7527e

Browse files
committed
recognize R development launcher
1 parent e551bc6 commit 9a7527e

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

visualvm/graalvm/src/org/graalvm/visualvm/graalvm/application/type/GraalVMApplicationTypeFactory.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public class GraalVMApplicationTypeFactory extends MainClassApplicationTypeFacto
4141
private static final String MAIN_CLASS = "com.oracle.graalvm.Main"; // NOI18N
4242
private static final String LEGACY_MAIN_CLASS = "com.oracle.graalvm.launcher.LegacyLauncher"; // NOI18N
4343
private static final String JAVASCRIPT_MAIN_CLASS = "com.oracle.truffle.js.shell.JSLauncher"; // NOI18N
44-
private static final String R_MAIN_CLASS = "com.oracle.truffle.r.legacylauncher.LegacyLauncher"; // NOI18N
44+
private static final String R_LEGACY_MAIN_CLASS = "com.oracle.truffle.r.legacylauncher.LegacyLauncher"; // NOI18N
45+
private static final String R_MAIN_CLASS = "com.oracle.truffle.r.launcher.RMain"; // NOI18N
4546
private static final String RUBY_MAIN_CLASS = "org.truffleruby.launcher.RubyLauncher"; // NOI18N
4647
private static final String PYTHON_MAIN_CLASS = "com.oracle.graal.python.shell.GraalPythonMain"; // NOI18N
4748
private static final String LLVM_MAIN_CLASS = "com.oracle.truffle.llvm.launcher.LLVMLauncher"; // NOI18N
@@ -71,6 +72,9 @@ private boolean isGraalVM(Jvm jvm, String mainClass) {
7172
if (R_MAIN_CLASS.equals(mainClass)) {
7273
return true;
7374
}
75+
if (R_LEGACY_MAIN_CLASS.equals(mainClass)) {
76+
return true;
77+
}
7478
if (RUBY_MAIN_CLASS.equals(mainClass)) {
7579
return true;
7680
}
@@ -116,6 +120,9 @@ private String getLangID(Jvm jvm) {
116120
if (R_MAIN_CLASS.equals(mainClass)) {
117121
return R_ID;
118122
}
123+
if (R_LEGACY_MAIN_CLASS.equals(mainClass)) {
124+
return R_ID;
125+
}
119126
if (RUBY_MAIN_CLASS.equals(mainClass)) {
120127
return RUBY_ID;
121128
}

0 commit comments

Comments
 (0)