MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Vladimir.Orlov
2016-03-21 16:09:10 +03:00
parent 3097640538 b0a05f7c1b
commit f89cc74e3d
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java
+4 -3
View File
@@ -118,9 +118,10 @@ public class StackTraceLine {
if (project == null) return null;
final PsiManager psiManager = PsiManager.getInstance(project);
PsiClass psiClass = JavaPsiFacade.getInstance(psiManager.getProject()).findClass(className, GlobalSearchScope.allScope(project));
if (psiClass == null || (psiClass.getNavigationElement() instanceof PsiCompiledElement)) return null;
psiClass = (PsiClass)psiClass.getNavigationElement();
final PsiFile psiFile = psiClass.getContainingFile();
PsiElement navElement = psiClass == null ? null : psiClass.getNavigationElement();
if (psiClass == null || navElement instanceof PsiCompiledElement) return null;
final PsiFile psiFile = navElement.getContainingFile();
return PsiTreeUtil.getParentOfType(psiFile.findElementAt(offsetOfLine(psiFile, lineNumber)), PsiClass.class, false);
}
platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/RefreshFileChooserAction.java
+8 -5
View File
@@ -15,18 +15,21 @@
*/
package com.intellij.openapi.fileChooser.actions;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.fileChooser.FileSystemTree;
import com.intellij.openapi.vfs.newvfs.ManagingFS;
import com.intellij.openapi.vfs.newvfs.RefreshQueue;
/**
* @author yole
*/
public class RefreshFileChooserAction extends AnAction implements DumbAware {
public void actionPerformed(final AnActionEvent e) {
*/
public class RefreshFileChooserAction extends FileChooserAction {
protected void update(FileSystemTree fileChooser, AnActionEvent e) {
}
@Override
protected void actionPerformed(FileSystemTree fileChooser, AnActionEvent e) {
RefreshQueue.getInstance().refresh(true, true, null, ModalityState.current(), ManagingFS.getInstance().getLocalRoots());
}
}