MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-34816 Navigation from stacktrace should consider run configuration classpath

Browse Source
This commit is contained in:
peter
2013-03-04 19:16:21 +01:00
parent 6a1f670ad0
commit 1dca788017
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
View File

@@ -81,7 +81,8 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
public RunProfileState getState(@NotNull final Executor executor, @NotNull final ExecutionEnvironment env) throws ExecutionException {
final JavaCommandLineState state = new JavaApplicationCommandLineState(this, env);
state.setConsoleBuilder(TextConsoleBuilderFactory.getInstance().createBuilder(getProject()));
JavaRunConfigurationModule module = getConfigurationModule();
state.setConsoleBuilder(TextConsoleBuilderFactory.getInstance().createBuilder(getProject(), module.getSearchScope()));
return state;
}

12
java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java
View File

@@ -50,15 +50,15 @@ public class JavaRunConfigurationModule extends RunConfigurationModule {
@Nullable
public PsiClass findClass(final String qualifiedName) {
if (qualifiedName == null) return null;
return JavaExecutionUtil.findMainClass(getProject(), qualifiedName, getSearchScope());
}
public GlobalSearchScope getSearchScope() {
final Module module = getModule();
final GlobalSearchScope scope;
if (module != null) {
scope = myClassesInLibraries ? module.getModuleRuntimeScope(true) : GlobalSearchScope.moduleWithDependenciesScope(module);
return myClassesInLibraries ? module.getModuleRuntimeScope(true) : GlobalSearchScope.moduleWithDependenciesScope(module);
}
else {
scope = myClassesInLibraries ? GlobalSearchScope.allScope(getProject()) : GlobalSearchScope.projectScope(getProject());
}
return JavaExecutionUtil.findMainClass(getProject(), qualifiedName, scope);
return myClassesInLibraries ? GlobalSearchScope.allScope(getProject()) : GlobalSearchScope.projectScope(getProject());
}
public static Collection<Module> getModulesForClass(@NotNull final Project project, final String className) {