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 branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-11-19 16:54:33 +03:00
parent ba8cf8ea67 fa4b567b01
commit ca5c7e7d6d
48 changed files with 983 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java
+12 -11
View File
@@ -182,7 +182,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
}
selectedForRecompilation.add(file);
if (pathsToRecompile == null || !pathsToRecompile.contains(fileId)) {
addSourceForRecompilation(projectId, file, null);
loadInfoAndAddSourceForRecompilation(projectId, file);
}
}
else {
@@ -286,7 +286,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
throws IOException {
final Project project = context.getProject();
final int projectId = getProjectId(project);
if (successfullyCompiled.size() > 0) {
if (!successfullyCompiled.isEmpty()) {
final LocalFileSystem lfs = LocalFileSystem.getInstance();
final IOException[] exceptions = {null};
// need read action here to ensure that no modifications were made to VFS while updating file attributes
@@ -354,7 +354,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
}
}
removeSourceForRecompilation(projectId, Math.abs(getFileId(file)));
if ((fileStamp > compilationStartStamp && !((CompileContextEx)context).isGenerated(file)) || forceRecompile.contains(file)) {
if (fileStamp > compilationStartStamp && !((CompileContextEx)context).isGenerated(file) || forceRecompile.contains(file)) {
// changes were made during compilation, need to re-schedule compilation
// it is important to invoke removeSourceForRecompilation() before this call to make sure
// the corresponding output paths will be scheduled for deletion
@@ -377,7 +377,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
public void run() {
for (VirtualFile file : filesToRecompile) {
if (file.isValid()) {
addSourceForRecompilation(projectId, file, null);
loadInfoAndAddSourceForRecompilation(projectId, file);
}
}
}
@@ -903,7 +903,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
// made public for tests
public void scanSourceContent(final ProjectRef projRef, final Collection<VirtualFile> roots, final int totalRootCount, final boolean isNewRoots) {
if (roots.size() == 0) {
if (roots.isEmpty()) {
return;
}
final int projectId = getProjectId(projRef.get());
@@ -1029,7 +1029,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
final String srcPath = outputInfo.getSourceFilePath();
final VirtualFile srcFile = srcPath != null? LocalFileSystem.getInstance().findFileByPath(srcPath) : null;
if (srcFile != null) {
addSourceForRecompilation(projectId, srcFile, null);
loadInfoAndAddSourceForRecompilation(projectId, srcFile);
}
}
}
@@ -1317,7 +1317,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
processRecursively(file, false, new FileProcessor() {
public void execute(final VirtualFile file) {
if (isCompilable(file)) {
addSourceForRecompilation(projectId, file, null);
loadInfoAndAddSourceForRecompilation(projectId, file);
}
}
@@ -1335,7 +1335,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
if (belongsToIntermediateSources(file, project)) {
processRecursively(file, false, new FileProcessor() {
public void execute(final VirtualFile file) {
addSourceForRecompilation(projectId, file, null);
loadInfoAndAddSourceForRecompilation(projectId, file);
}
});
}
@@ -1356,9 +1356,10 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
return false;
}
private void addSourceForRecompilation(final int projectId, final VirtualFile srcFile, @Nullable final SourceFileInfo preloadedInfo) {
final SourceFileInfo srcInfo = preloadedInfo != null? preloadedInfo : loadSourceInfo(srcFile);
private void loadInfoAndAddSourceForRecompilation(final int projectId, final VirtualFile srcFile) {
addSourceForRecompilation(projectId, srcFile, loadSourceInfo(srcFile));
}
private void addSourceForRecompilation(final int projectId, final VirtualFile srcFile, @Nullable final SourceFileInfo srcInfo) {
final boolean alreadyMarked;
synchronized (myDataLock) {
TIntHashSet set = mySourcesToRecompile.get(projectId);
java/java-tests/testSrc/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenterTest.java
+1 -9
View File
@@ -12,7 +12,6 @@ import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -109,14 +108,7 @@ public class NotNullVerifyingInstrumenterTest extends UsefulTestCase {
MyClassLoader classLoader = new MyClassLoader(getClass().getClassLoader());
for (File file : files) {
final String fileName = file.getName();
FileInputStream stream = new FileInputStream(file);
byte[] content;
try {
content = FileUtil.adaptiveLoadBytes(stream);
}
finally {
stream.close();
}
byte[] content = FileUtil.loadFileBytes(file);
ClassReader reader = new ClassReader(content, 0, content.length);
ClassWriter writer = new PsiClassWriter(myFixture.getProject(), false);
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CollectHighlightsUtil.java
+4 -2
View File
@@ -146,8 +146,10 @@ public class CollectHighlightsUtil {
LOG.assertTrue(commonParent != null);
LOG.assertTrue(commonParent.getTextRange() != null);
while (commonParent.getParent() != null && commonParent.getTextRange().equals(commonParent.getParent().getTextRange())) {
commonParent = commonParent.getParent();
PsiElement parent = commonParent.getParent();
while (parent != null && commonParent.getTextRange().equals(parent.getTextRange())) {
commonParent = parent;
parent = parent.getParent();
}
return commonParent;
}
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
+2 -2
View File
@@ -190,11 +190,11 @@ class DaemonListeners implements Disposable {
connection.subscribe(DumbService.DUMB_MODE, new DumbService.DumbModeListener() {
public void enteredDumbMode() {
stopDaemon(true);
myDaemonCodeAnalyzer.restart();
}
public void exitDumbMode() {
stopDaemon(true);
myDaemonCodeAnalyzer.restart();
}
});
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/Divider.java
+15 -4
View File
@@ -43,12 +43,13 @@ public class Divider {
@NotNull TextRange range,
@NotNull List<PsiElement> inside,
@NotNull List<PsiElement> outside,
@NotNull HighlightLevelUtil.AnalysisLevel level) {
@NotNull HighlightLevelUtil.AnalysisLevel level,
boolean includeParents) {
final FileViewProvider viewProvider = file.getViewProvider();
for (Language language : viewProvider.getLanguages()) {
final PsiFile psiRoot = viewProvider.getPsi(language);
if (HighlightLevelUtil.shouldAnalyse(psiRoot, level)) {
divideInsideAndOutside(psiRoot, startOffset, endOffset, range, inside, outside);
divideInsideAndOutside(psiRoot, startOffset, endOffset, range, inside, outside, includeParents);
}
}
}
@@ -58,8 +59,8 @@ public class Divider {
int endOffset,
@NotNull TextRange range,
@NotNull List<PsiElement> inside,
@NotNull List<PsiElement> outside
) {
@NotNull List<PsiElement> outside,
boolean includeParents) {
final int currentOffset = root.getTextRange().getStartOffset();
final Condition<PsiElement>[] filters = Extensions.getExtensions(CollectHighlightsUtil.EP_NAME);
@@ -122,5 +123,15 @@ public class Divider {
child = PsiUtilBase.NULL_PSI_ELEMENT;
}
}
if (includeParents) {
PsiElement parent = !outside.isEmpty() ? outside.get(outside.size() - 1) :
!inside.isEmpty() ? inside.get(inside.size() - 1) :
CollectHighlightsUtil.findCommonParent(root, startOffset, endOffset);
while (parent != null && parent != root) {
parent = parent.getParent();
if (parent != null) outside.add(parent);
}
}
}
}
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
+1 -1
View File
@@ -177,7 +177,7 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP
final List<PsiElement> outside = new ArrayList<PsiElement>();
try {
Divider.divideInsideAndOutside(myFile, myStartOffset, myEndOffset, myPriorityRange, inside, outside,
HighlightLevelUtil.AnalysisLevel.HIGHLIGHT);
HighlightLevelUtil.AnalysisLevel.HIGHLIGHT,false);
final Set<PsiFile> injected = new THashSet<PsiFile>();
getInjectedPsiFiles(inside, outside, progress, injected);
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
+2 -2
View File
@@ -196,9 +196,9 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
ArrayList<PsiElement> inside = new ArrayList<PsiElement>();
ArrayList<PsiElement> outside = new ArrayList<PsiElement>();
Divider.divideInsideAndOutside(myFile, myStartOffset, myEndOffset, myPriorityRange, inside, outside,
HighlightLevelUtil.AnalysisLevel.HIGHLIGHT_AND_INSPECT);
HighlightLevelUtil.AnalysisLevel.HIGHLIGHT_AND_INSPECT,true);
setProgressLimit(1L * tools.size() *2/** (inside.size() + outside.size())*/);
setProgressLimit(1L * tools.size() * 2);
final LocalInspectionToolSession session = new LocalInspectionToolSession(myFile, myStartOffset, myEndOffset);
List<Trinity<LocalInspectionTool, ProblemsHolder, PsiElementVisitor>> init = new ArrayList<Trinity<LocalInspectionTool, ProblemsHolder, PsiElementVisitor>>();
platform/lang-impl/src/com/intellij/codeInspection/actions/GotoInspectionModel.java
+241
View File
@@ -0,0 +1,241 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInspection.actions;
import com.intellij.codeInspection.InspectionProfileEntry;
import com.intellij.codeInspection.ex.InspectionProfileImpl;
import com.intellij.codeInspection.ex.ScopeToolState;
import com.intellij.ide.IdeBundle;
import com.intellij.ide.util.gotoByName.SimpleChooseByNameModel;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.profile.codeInspection.InspectionProfileManager;
import com.intellij.util.ArrayUtil;
import org.apache.oro.text.regex.*;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.util.*;
/**
* @author Konstantin Bulenkov
*/
public class GotoInspectionModel extends SimpleChooseByNameModel {//implements CustomMatcherModel {
private String myPattern;
private Pattern myCompiledPattern;
private final PatternMatcher myMatcher = new Perl5Matcher();
private final Map<String, InspectionProfileEntry> myToolNames = new HashMap<String, InspectionProfileEntry>();
private final Map<String, Set<InspectionProfileEntry>> myGroupNames = new HashMap<String, Set<InspectionProfileEntry>>();
private final Map<String, InspectionProfileEntry> myToolShortNames = new HashMap<String, InspectionProfileEntry>();
private String[] myNames;
private final ListCellRenderer myListCellRenderer = new InspectionListCellRenderer();
public GotoInspectionModel(Project project) {
super(project, IdeBundle.message("prompt.goto.inspection.enter.name"), null); //TODO help ID
final InspectionProfileImpl rootProfile = (InspectionProfileImpl)InspectionProfileManager.getInstance().getRootProfile();
for (ScopeToolState state : rootProfile.getAllTools()) {
final InspectionProfileEntry tool = state.getTool();
myToolNames.put(tool.getDisplayName(), tool);
final String groupName = tool.getGroupDisplayName();
Set<InspectionProfileEntry> toolsInGroup = myGroupNames.get(groupName);
if (toolsInGroup == null) {
toolsInGroup = new HashSet<InspectionProfileEntry>();
myGroupNames.put(groupName, toolsInGroup);
}
toolsInGroup.add(tool);
myToolShortNames.put(tool.getShortName(), tool);
}
final Set<String> nameIds = new HashSet<String>();
nameIds.addAll(myToolNames.keySet());
nameIds.addAll(myGroupNames.keySet());
//nameIds.addAll(myToolShortNames.keySet());
myNames = ArrayUtil.toStringArray(nameIds);
}
public ListCellRenderer getListCellRenderer() {
return myListCellRenderer;
}
public String[] getNames() {
return myNames;
}
public Object[] getElementsByName(final String id, final String pattern) {
final Set<InspectionProfileEntry> result = new HashSet<InspectionProfileEntry>();
InspectionProfileEntry e = myToolNames.get(id);
if (e != null) {
result.add(e);
}
e = myToolShortNames.get(id);
if (e != null) {
result.add(e);
}
final Set<InspectionProfileEntry> entries = myGroupNames.get(id);
if (entries != null) {
result.addAll(entries);
}
return result.toArray(new InspectionProfileEntry[result.size()]);
}
public String getElementName(final Object element) {
if (element instanceof InspectionProfileEntry) {
final InspectionProfileEntry entry = (InspectionProfileEntry)element;
return entry.getDisplayName() + " " + entry.getGroupDisplayName();
}
return null;
}
private List<InspectionProfileEntry> findEntries(String name) {
final List<InspectionProfileEntry> result = new ArrayList<InspectionProfileEntry>();
InspectionProfileEntry e = myToolNames.get(name);
if (e != null) {
result.add(e);
}
//e = myToolShortNames.get(name);
//if (e != null) {
// result.add(e);
//}
final Set<InspectionProfileEntry> entrySet = myGroupNames.get(name);
if (entrySet != null) {
result.addAll(entrySet);
}
return result;
}
public boolean matches(@NotNull final String name, @NotNull final String pattern) {
for (InspectionProfileEntry entry : findEntries(name)) {
final String toolName = entry.getDisplayName();
final String id = entry.getShortName();
final String group = entry.getGroupDisplayName();
final Pattern compiledPattern = getPattern(pattern);
if (myMatcher.matches(toolName, compiledPattern)
|| myMatcher.matches(id, compiledPattern)
|| myMatcher.matches(group, compiledPattern)) {
return true;
}
}
return false;
}
@NotNull
private Pattern getPattern(String pattern) {
if (!Comparing.strEqual(pattern, myPattern)) {
myCompiledPattern = null;
myPattern = pattern;
}
if (myCompiledPattern == null) {
boolean allowToLower = true;
final int eol = pattern.indexOf('\n');
if (eol != -1) {
pattern = pattern.substring(0, eol);
}
if (pattern.length() >= 80) {
pattern = pattern.substring(0, 80);
}
final @NonNls StringBuffer buffer = new StringBuffer();
if (containsOnlyUppercaseLetters(pattern)) {
allowToLower = false;
}
if (allowToLower) {
buffer.append(".*");
}
boolean firstIdentifierLetter = true;
for (int i = 0; i < pattern.length(); i++) {
final char c = pattern.charAt(i);
if (Character.isLetterOrDigit(c)) {
// This logic allows to use uppercase letters only to catch the name like PDM for PsiDocumentManager
if (Character.isUpperCase(c) || Character.isDigit(c)) {
if (!firstIdentifierLetter) {
buffer.append("[^A-Z]*");
}
buffer.append("[");
buffer.append(c);
if (allowToLower || i == 0) {
buffer.append('|');
buffer.append(Character.toLowerCase(c));
}
buffer.append("]");
}
else if (Character.isLowerCase(c)) {
buffer.append('[');
buffer.append(c);
buffer.append('|');
buffer.append(Character.toUpperCase(c));
buffer.append(']');
}
else {
buffer.append(c);
}
firstIdentifierLetter = false;
}
else if (c == '*') {
buffer.append(".*");
firstIdentifierLetter = true;
}
else if (c == '.') {
buffer.append("\\.");
firstIdentifierLetter = true;
}
else if (c == ' ') {
buffer.append("[^A-Z]*\\ ");
firstIdentifierLetter = true;
}
else {
firstIdentifierLetter = true;
// for standard RegExp engine
// buffer.append("\\u");
// buffer.append(Integer.toHexString(c + 0x20000).substring(1));
// for OROMATCHER RegExp engine
buffer.append("\\x");
buffer.append(Integer.toHexString(c + 0x20000).substring(3));
}
}
buffer.append(".*");
try {
myCompiledPattern = new Perl5Compiler().compile(buffer.toString());
}
catch (MalformedPatternException e) {
//do nothing
}
}
return myCompiledPattern;
}
private static boolean containsOnlyUppercaseLetters(String s) {
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
if (c != '*' && c != ' ' && !Character.isUpperCase(c)) return false;
}
return true;
}
}
platform/lang-impl/src/com/intellij/codeInspection/actions/InspectionListCellRenderer.java
+54
View File
@@ -0,0 +1,54 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInspection.actions;
import com.intellij.codeInspection.InspectionProfileEntry;
import com.intellij.util.ui.EmptyIcon;
import com.intellij.util.ui.UIUtil;
import javax.swing.*;
import java.awt.*;
/**
* @author Konstantin Bulenkov
*/
@SuppressWarnings({"GtkPreferredJComboBoxRenderer"})
public class InspectionListCellRenderer extends DefaultListCellRenderer {
private static final EmptyIcon EMPTY_ICON = new EmptyIcon(18, 18);
public Component getListCellRendererComponent(JList list, Object value, int index, boolean sel, boolean focus) {
final JPanel panel = new JPanel(new BorderLayout());
panel.setOpaque(true);
final Color bg = sel ? UIUtil.getListSelectionBackground() : UIUtil.getListBackground();
panel.setBackground(bg);
if (value instanceof InspectionProfileEntry) {
final InspectionProfileEntry tool = (InspectionProfileEntry)value;
final Color fg = sel ? UIUtil.getListSelectionForeground() : UIUtil.getListForeground();
final JLabel label = new JLabel(" " + tool.getDisplayName());
panel.add(label, BorderLayout.WEST);
final JLabel groupLabel = new JLabel(tool.getGroupDisplayName() + " ", EMPTY_ICON, LEFT);
groupLabel.setBackground(bg);
groupLabel.setForeground(fg);
panel.add(groupLabel, BorderLayout.EAST);
}
return panel;
}
}
platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java
+141
View File
@@ -0,0 +1,141 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInspection.actions;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.analysis.AnalysisUIOptions;
import com.intellij.analysis.BaseAnalysisActionDialog;
import com.intellij.codeInspection.InspectionProfileEntry;
import com.intellij.codeInspection.InspectionsBundle;
import com.intellij.codeInspection.ex.GlobalInspectionContextImpl;
import com.intellij.codeInspection.ex.InspectionManagerEx;
import com.intellij.codeInspection.ex.InspectionProfileImpl;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.ide.IdeBundle;
import com.intellij.ide.actions.GotoActionBase;
import com.intellij.ide.util.gotoByName.ChooseByNamePopup;
import com.intellij.ide.util.gotoByName.ChooseByNamePopupComponent;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import java.awt.*;
import java.util.Arrays;
/**
* @author Konstantin Bulenkov
*/
public class RunInspectionAction extends GotoActionBase {
public RunInspectionAction() {
getTemplatePresentation().setText(IdeBundle.message("goto.inspection.action.text"));
}
@Override
protected void gotoActionPerformed(final AnActionEvent e) {
final Project project = e.getData(PlatformDataKeys.PROJECT);
final Component component = e.getData(PlatformDataKeys.CONTEXT_COMPONENT);
final PsiElement psiElement = LangDataKeys.PSI_ELEMENT.getData(e.getDataContext());
final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(e.getDataContext());
final VirtualFile virtualFile = LangDataKeys.VIRTUAL_FILE.getData(e.getDataContext());
if (project == null || virtualFile == null) return;
FeatureUsageTracker.getInstance().triggerFeatureUsed("navigation.goto.inspection");
final ChooseByNamePopup popup = ChooseByNamePopup.createPopup(project, new GotoInspectionModel(project), getPsiContext(e));
popup.setSearchInAnyPlace(true);
popup.invoke(new ChooseByNamePopupComponent.Callback() {
public void onClose() {
if (RunInspectionAction.class.equals(myInAction)) {
myInAction = null;
}
}
public void elementChosen(Object element) {
final InspectionProfileEntry profileEntry = (InspectionProfileEntry)element;
runInspection(project, profileEntry, virtualFile, psiElement, psiFile);
}
}, ModalityState.current(), true);
}
private static void runInspection(@NotNull Project project,
@NotNull InspectionProfileEntry profileEntry,
@NotNull VirtualFile virtualFile,
PsiElement psiElement, PsiFile psiFile) {
final String shortName = profileEntry.getShortName();
final InspectionManagerEx managerEx = (InspectionManagerEx)InspectionManagerEx.getInstance(project);
final Module module = ModuleUtil.findModuleForFile(virtualFile, project);
AnalysisScope analysisScope = null;
if (psiFile != null) {
analysisScope = new AnalysisScope(psiFile);
} else {
if (virtualFile.isDirectory()) {
final PsiDirectory psiDirectory = PsiManager.getInstance(project).findDirectory(virtualFile);
if (psiDirectory != null) {
analysisScope = new AnalysisScope(psiDirectory);
}
}
if (analysisScope == null) {
analysisScope = new AnalysisScope(project, Arrays.asList(virtualFile));
}
}
final BaseAnalysisActionDialog dlg = new BaseAnalysisActionDialog(
AnalysisScopeBundle.message("specify.analysis.scope", InspectionsBundle.message("inspection.action.title")),
AnalysisScopeBundle.message("analysis.scope.title", InspectionsBundle.message("inspection.action.noun")),
project,
analysisScope,
module != null ? module.getName() : null,
true,
AnalysisUIOptions.getInstance(project),
psiElement);
AnalysisScope scope = analysisScope;
dlg.show();
if (!dlg.isOK()) return;
final AnalysisUIOptions uiOptions = AnalysisUIOptions.getInstance(project);
scope = dlg.getScope(uiOptions, scope, project, module);
final InspectionProfileImpl profile = new InspectionProfileImpl(profileEntry.getDisplayName());
final InspectionProfileImpl model = (InspectionProfileImpl)profile.getModifiableModel();
final InspectionProfileEntry[] profileEntries = model.getInspectionTools(null);
for (InspectionProfileEntry entry : profileEntries) {
model.disableTool(entry.getShortName());
}
model.enableTool(shortName);
try {
Element element = new Element("toCopy");
profileEntry.writeSettings(element);
model.getInspectionTool(shortName).readSettings(element);
}
catch (Exception e) {
//skip
}
model.setEditable(profileEntry.getDisplayName());
final GlobalInspectionContextImpl inspectionContext = managerEx.createNewGlobalContext(false);
inspectionContext.setExternalProfile(model);
inspectionContext.doInspections(scope, managerEx);
}
}
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+13
View File
@@ -81,6 +81,7 @@ public abstract class ChooseByNameBase {
protected final String myInitialText;
private boolean myPreselectInitialText;
private final Reference<PsiElement> myContext;
private boolean mySearchInAnyPlace = false;
protected Component myPreviouslyFocusedComponent;
@@ -166,6 +167,14 @@ public abstract class ChooseByNameBase {
myShowListAfterCompletionKeyStroke = showListAfterCompletionKeyStroke;
}
public boolean isSearchInAnyPlace() {
return mySearchInAnyPlace;
}
public void setSearchInAnyPlace(boolean searchInAnyPlace) {
mySearchInAnyPlace = searchInAnyPlace;
}
/**
* Set tool area. The method may be called only before invoke.
*
@@ -1196,6 +1205,10 @@ public abstract class ChooseByNameBase {
String namePattern = getNamePattern(pattern);
String qualifierPattern = getQualifierPattern(pattern);
if (isSearchInAnyPlace() && namePattern.trim().length() > 0) {
namePattern = "*" + namePattern + "*";
}
boolean empty = namePattern.length() == 0 || namePattern.equals("@"); // TODO[yole]: remove implicit dependency
if (empty && !canShowListForEmptyPattern()) return;
platform/lang-impl/src/com/intellij/ide/util/gotoByName/SimpleChooseByNameModel.java
+106
View File
@@ -0,0 +1,106 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.ide.util.gotoByName;
import com.intellij.codeInspection.InspectionsBundle;
import com.intellij.openapi.project.Project;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author Konstantin Bulenkov
*/
public abstract class SimpleChooseByNameModel implements ChooseByNameModel {
private final Project myProject;
private final String myPrompt;
private final String myHelpId;
protected SimpleChooseByNameModel(@NotNull Project project, @NotNull String prompt, @Nullable String helpId) {
myProject = project;
myPrompt = prompt;
myHelpId = helpId;
}
public abstract String[] getNames();
protected abstract Object[] getElementsByName(String name, String pattern);
public Project getProject() {
return myProject;
}
@Override
public String getPromptText() {
return myPrompt;
}
@Override
public String getNotInMessage() {
return InspectionsBundle.message("nothing.found");
}
@Override
public String getNotFoundMessage() {
return InspectionsBundle.message("nothing.found");
}
@Override
public String getCheckBoxName() {
return null;
}
@Override
public char getCheckBoxMnemonic() {
return 0;
}
@Override
public boolean loadInitialCheckBoxState() {
return false;
}
@Override
public void saveInitialCheckBoxState(boolean state) {
}
@Override
public String[] getNames(boolean checkBoxState) {
return getNames();
}
@Override
public Object[] getElementsByName(String name, boolean checkBoxState, String pattern) {
return getElementsByName(name, pattern);
}
@NotNull
@Override
public String[] getSeparators() {
return ArrayUtil.EMPTY_STRING_ARRAY;
}
@Override
public String getFullName(Object element) {
return getElementName(element);
}
@Override
public String getHelpId() {
return myHelpId;
}
}
platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java
+1 -1
View File
@@ -185,7 +185,7 @@ public class VfsUtil {
public static VirtualFile copyFile(Object requestor, @NotNull VirtualFile file, @NotNull VirtualFile toDir, @NotNull @NonNls String newName)
throws IOException {
final VirtualFile newChild = toDir.createChildData(requestor, newName);
// [jeka] TODO: to be duscussed if the copy should have the same timestamp as the original
// [jeka] TODO: to be discussed if the copy should have the same timestamp as the original
//OutputStream out = newChild.getOutputStream(requestor, -1, file.getActualTimeStamp());
newChild.setBinaryContent(file.contentsToByteArray());
return newChild;
platform/platform-api/src/com/intellij/ui/content/Content.java
+1 -1
View File
@@ -63,7 +63,7 @@ public interface Content extends UserDataHolder, ComponentContainer {
Disposable getDisposer();
/**
* @param disposer a Disposable object whoes dispose() method will be invoked upon this content release.
* @param disposer a Disposable object which dispose() method will be invoked upon this content release.
*/
void setDisposer(Disposable disposer);
platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+1 -1
View File
@@ -753,7 +753,7 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application
return;
}
LOG.assertTrue(myTestModeFlag || !Thread.holdsLock(PsiLock.LOCK), "Thread must not hold PsiLock while performing readAction");
LOG.assertTrue(!Thread.holdsLock(PsiLock.LOCK), "Thread must not hold PsiLock while performing readAction");
try {
myActionsLock.readLock().acquire();
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/MappingUtil.java
-3
View File
@@ -65,9 +65,6 @@ public class MappingUtil {
continue;
}
if (cacheEntry.startOffset > offset) {
if (start == end) {
return start - 1;
}
end = i - 1;
continue;
}
platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java
+2 -1
View File
@@ -239,7 +239,8 @@ class CacheUpdateRunner {
}
private static Runnable getProcessWrapper(final Runnable process) {
return ApplicationManager.getApplication().isWriteAccessAllowed() ? new Runnable() {
// launching thread will hold read access for workers
return ApplicationManager.getApplication().isReadAccessAllowed() ? new Runnable() {
@Override
public void run() {
boolean old = ApplicationImpl.setExceptionalThreadWithReadAccessFlag(true);
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java
-4
View File
@@ -549,10 +549,6 @@ public class PersistentFS extends ManagingFS implements ApplicationComponent {
return stream;
}
public void restoreContent(VirtualFile file, Object requestor, final long modStamp, final long timeStamp) {
}
public int acquireContent(VirtualFile file) {
return myRecords.acquireFileContent(getFileId(file));
}
platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
+1
View File
@@ -106,6 +106,7 @@ group.tools=Tools support
navigation.popup.action=Go to action
navigation.goto.usages=Show usages
navigation.goto.inspection=Go to inspection
# suppress inspection "UnusedProperty"
editing.completion.completeStatement=Complete Statement from Code Completion
codeassists.highlight.implements=Highlight implementing or overriding members
platform/platform-resources-en/src/messages/IdeBundle.properties
+3
View File
@@ -1069,3 +1069,6 @@ browsers.settings=Web Browsers
updates.check.period.on.exit=On every exit
use.sun.jdk.prompt=Java version is not supported, please use Sun/Oracle JDK rather than OpenJDK
prompt.goto.inspection.enter.name=Enter inspection name:
goto.inspection.action.text=&Run Inspection by Name...
label.no.inspections.found=No inspections found
platform/platform-resources-en/src/messages/InspectionsBundle.properties
+1
View File
@@ -626,3 +626,4 @@ detach.library.roots.quickfix.name=Detach unused library roots
inspection.javadoc.problem.pointing.to.itself=Javadoc pointing to itself
inspection.redirect.template=<html><body>Injected element has problem: {0} (in <a href=\"#navigation/{1}:{2}\">{3}</a>). </body></html>
nothing.found=Nothing found
platform/platform-resources-en/src/tips/GoToInspection.html
+14
View File
@@ -0,0 +1,14 @@
<html>
<body style="font-family: Verdana; font-size: 13;" LEFTMARGIN="25" TOPMARGIN="25">
<table cellpadding="15" width="98%" border="0">
<tr>
<td>To quickly find and run an inspection press
&shortcut:RunInspection;
(<font style="font-family: Verdana; font-weight:bold;" size="3" color="#005555">Go To | Inspection</font> on the main
menu) and start typing the name of the inspection or its group. Choose the desired inspection from the suggestion list and
then select a desired scope.
</td>
</tr>
</table>
</body>
</html>
platform/platform-resources/src/idea/Keymap_Default.xml
+3
View File
@@ -215,6 +215,9 @@
<action id="GotoAction">
<keyboard-shortcut first-keystroke="control shift A"/>
</action>
<action id="RunInspection">
<keyboard-shortcut first-keystroke="control shift alt I"/>
</action>
<action id="FileStructurePopup">
<keyboard-shortcut first-keystroke="control F12"/>
</action>
platform/platform-resources/src/idea/LangActions.xml
+5
View File
@@ -698,6 +698,11 @@
<reference ref="XDebugger.CopyValue"/>
</group>
<group id="XDebugger.Value.Hint.Tree.Popup">
<reference ref="XDebugger.CopyValue"/>
<reference ref="XDebugger.AddToWatches"/>
</group>
<group id="RunnerLayoutActions">
<group id="Runner.Layout" icon="/debugger/restoreLayout.png" popup="true">
<action id="Runner.RestoreLayout" class="com.intellij.execution.ui.layout.actions.RestoreLayoutAction"/>
platform/platform-resources/src/idea/PlatformLangActionManager.xml
+2 -1
View File
@@ -53,10 +53,11 @@
<group id="InspectCodeGroup">
<separator/>
<action id="InspectCode" class="com.intellij.codeInspection.actions.CodeInspectionAction"/>
<action id="RunInspection" class="com.intellij.codeInspection.actions.RunInspectionAction" />
<action id="ViewOfflineInspection" class="com.intellij.codeInspection.actions.ViewOfflineResultsAction"/>
<add-to-group group-id="CodeMenu" anchor="last"/>
</group>
</actions>
</component>
</component>
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+3 -3
View File
@@ -157,6 +157,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
}
};
myRootPanel = new MyPanel(myTree);
Disposer.register(this, myRootPanel);
myModelTracker = new UsageModelTracker(project);
Disposer.register(this, myModelTracker);
@@ -798,7 +799,6 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
ToolTipManager.sharedInstance().unregisterComponent(myTree);
myModelTracker.removeListener(this);
myUpdateAlarm.cancelAllRequests();
myRootPanel.dispose();
if (myUsagePreviewPanel != null) {
UsageViewSettings.getInstance().PREVIEW_USAGES_SPLITTER_PROPORTIONS = ((Splitter)myUsagePreviewPanel.getParent()).getProportion();
myUsagePreviewPanel = null;
@@ -1061,7 +1061,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
return myModel.areTargetsValid();
}
private class MyPanel extends JPanel implements TypeSafeDataProvider, OccurenceNavigator {
private class MyPanel extends JPanel implements TypeSafeDataProvider, OccurenceNavigator,Disposable {
@Nullable private OccurenceNavigatorSupport mySupport;
private MyPanel(JTree tree) {
@@ -1081,7 +1081,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
};
}
private void dispose() {
public void dispose() {
mySupport = null;
}
platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointManager.java
+2
View File
@@ -50,6 +50,8 @@ public interface XBreakpointManager {
XLineBreakpoint<P> findBreakpointAtLine(@NotNull XLineBreakpointType<P> type, @NotNull VirtualFile file, int line);
boolean isDefaultBreakpoint(@NotNull XBreakpoint<?> breakpoint);
<B extends XBreakpoint<P>, P extends XBreakpointProperties>
void addBreakpointListener(@NotNull XBreakpointType<B,P> type, @NotNull XBreakpointListener<B> listener);
platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointType.java
+13 -1
View File
@@ -39,8 +39,9 @@ import java.util.Comparator;
* &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
* &nbsp;&nbsp;&lt;xdebugger.breakpointType implementation="qualified-class-name"/&gt;<br>
* &lt;/extensions&gt;
* <p><p>
*
* Use this class only for breakpoints like an exception breakpoints in Java. If a breakpoint will be put on some line in a file use
* Use this class only for breakpoints like exception breakpoints in Java. If a breakpoint will be put on some line in a file use
* {@link XLineBreakpointType} instead
*
* @author nik
@@ -145,6 +146,17 @@ public abstract class XBreakpointType<B extends XBreakpoint<P>, P extends XBreak
return null;
}
/**
* Returns properties of the default breakpoint. The default breakpoints cannot be deleted and is always shown on top of the breakpoints
* list in the dialog. It is disabled by default.
*
* @return a default breakpoint properties or {@code null} if default breakpoint isn't supported
*/
@Nullable
public P createDefaultBreakpointProperties() {
return null;
}
@Nullable @NonNls
public String getBreakpointsDialogHelpTopic() {
return null;
platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XLineBreakpointType.java
+9 -1
View File
@@ -39,7 +39,7 @@ import java.util.Collections;
* &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
* &nbsp;&nbsp;&lt;xdebugger.breakpointType implementation="qualified-class-name"/&gt;<br>
* &lt;/extensions&gt;
*
* <p><p>
* In order to support actual setting breakpoints in a debugging process create a {@link XBreakpointHandler} implementation and return it
* from {@link com.intellij.xdebugger.XDebugProcess#getBreakpointHandlers()} method
*
@@ -85,6 +85,14 @@ public abstract class XLineBreakpointType<P extends XBreakpointProperties> exten
return XDebuggerUtil.getInstance().getDefaultLineBreakpointComparator();
}
/**
* Default line breakpoints cannot be supported
*/
@Override
public final P createDefaultBreakpointProperties() {
return null;
}
public List<? extends AnAction> getAdditionalPopupMenuActions(@NotNull XLineBreakpoint<P> breakpoint, @Nullable XDebugSession currentSession) {
return Collections.emptyList();
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/XDebuggerActions.java
+1
View File
@@ -44,6 +44,7 @@ public interface XDebuggerActions {
@NonNls String VARIABLES_TREE_POPUP_GROUP = "XDebugger.Variables.Tree.Popup";
@NonNls String WATCHES_TREE_POPUP_GROUP = "XDebugger.Watches.Tree.Popup";
@NonNls String WATCHES_TREE_TOOLBAR_GROUP = "XDebugger.Watches.Tree.Toolbar";
@NonNls String VALUE_HINT_TREE_POPUP_GROUP = "XDebugger.Value.Hint.Tree.Popup";
@NonNls String ADD_TO_WATCH = "Debugger.AddToWatch";
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerImpl.java
+112 -24
View File
@@ -18,19 +18,24 @@ package com.intellij.xdebugger.impl.breakpoints;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.util.MultiValuesMap;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.ex.http.HttpFileSystem;
import com.intellij.openapi.vfs.ex.http.HttpVirtualFileListener;
import com.intellij.util.EventDispatcher;
import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters;
import com.intellij.util.xmlb.XmlSerializer;
import com.intellij.util.xmlb.annotations.AbstractCollection;
import com.intellij.util.xmlb.annotations.MapAnnotation;
import com.intellij.util.xmlb.annotations.Tag;
import com.intellij.xdebugger.XSourcePosition;
import com.intellij.xdebugger.breakpoints.*;
import com.intellij.xdebugger.impl.XDebuggerManagerImpl;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -41,7 +46,10 @@ import java.util.*;
* @author nik
*/
public class XBreakpointManagerImpl implements XBreakpointManager, PersistentStateComponent<XBreakpointManagerImpl.BreakpointManagerState> {
private static final Logger LOG = Logger.getInstance("#com.intellij.xdebugger.impl.breakpoints.XBreakpointManagerImpl");
public static final SkipDefaultValuesSerializationFilters SERIALIZATION_FILTER = new SkipDefaultValuesSerializationFilters();
private final MultiValuesMap<XBreakpointType, XBreakpointBase<?,?,?>> myBreakpoints = new MultiValuesMap<XBreakpointType, XBreakpointBase<?,?,?>>(true);
private final Map<XBreakpointType, XBreakpointBase<?,?,?>> myDefaultBreakpoints = new LinkedHashMap<XBreakpointType, XBreakpointBase<?, ?, ?>>();
private final Map<XBreakpointType, EventDispatcher<XBreakpointListener>> myDispatchers = new HashMap<XBreakpointType, EventDispatcher<XBreakpointListener>>();
private final Map<XBreakpointType<?,?>, XBreakpointTypeDialogState> myBreakpointsDialogSettings = new HashMap<XBreakpointType<?,?>, XBreakpointTypeDialogState>();
private final EventDispatcher<XBreakpointListener> myAllBreakpointsDispatcher;
@@ -99,15 +107,29 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
@NotNull
public <T extends XBreakpointProperties> XBreakpoint<T> addBreakpoint(final XBreakpointType<XBreakpoint<T>,T> type, @Nullable final T properties) {
ApplicationManager.getApplication().assertWriteAccessAllowed();
XBreakpointBase.BreakpointState<?,T,?> state = new XBreakpointBase.BreakpointState<XBreakpoint<T>,T,XBreakpointType<XBreakpoint<T>,T>>(true, type.getId());
return addBreakpoint(type, properties, false, true);
}
private <T extends XBreakpointProperties> XBreakpointBase<?, T, ?> addBreakpoint(XBreakpointType<XBreakpoint<T>, T> type,
T properties,
final boolean defaultBreakpoint,
final boolean initUI) {
XBreakpointBase.BreakpointState<?,T,?> state = new XBreakpointBase.BreakpointState<XBreakpoint<T>,T,XBreakpointType<XBreakpoint<T>,T>>(!defaultBreakpoint, type.getId());
XBreakpointBase<?,T, ?> breakpoint = new XBreakpointBase<XBreakpoint<T>,T, XBreakpointBase.BreakpointState<?,T,?>>(type, this, properties, state);
addBreakpoint(breakpoint, true);
addBreakpoint(breakpoint, defaultBreakpoint, initUI);
return breakpoint;
}
private <T extends XBreakpointProperties> void addBreakpoint(final XBreakpointBase<?,T,?> breakpoint, boolean initUI) {
private <T extends XBreakpointProperties> void addBreakpoint(final XBreakpointBase<?, T, ?> breakpoint, final boolean defaultBreakpoint,
boolean initUI) {
XBreakpointType type = breakpoint.getType();
myBreakpoints.put(type, breakpoint);
if (defaultBreakpoint) {
LOG.assertTrue(!myDefaultBreakpoints.containsKey(type), "Cannot have more than one default breakpoint (type " + type.getId() + ")");
myDefaultBreakpoints.put(type, breakpoint);
}
else {
myBreakpoints.put(type, breakpoint);
}
if (breakpoint instanceof XLineBreakpointImpl) {
myLineBreakpointManager.registerBreakpoint((XLineBreakpointImpl)breakpoint, initUI);
}
@@ -138,6 +160,10 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
public void removeBreakpoint(@NotNull final XBreakpoint<?> breakpoint) {
ApplicationManager.getApplication().assertWriteAccessAllowed();
doRemoveBreakpoint(breakpoint);
}
private void doRemoveBreakpoint(XBreakpoint<?> breakpoint) {
XBreakpointType type = breakpoint.getType();
XBreakpointBase<?,?,?> breakpointBase = (XBreakpointBase<?,?,?>)breakpoint;
myBreakpoints.remove(type, breakpointBase);
@@ -158,26 +184,32 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
final int line, @Nullable final T properties) {
ApplicationManager.getApplication().assertWriteAccessAllowed();
XLineBreakpointImpl<T> breakpoint = new XLineBreakpointImpl<T>(type, this, fileUrl, line, properties);
addBreakpoint(breakpoint, true);
addBreakpoint(breakpoint, false, true);
return breakpoint;
}
@NotNull
public XBreakpointBase<?,?,?>[] getAllBreakpoints() {
ApplicationManager.getApplication().assertReadAccessAllowed();
Collection<XBreakpointBase<?,?,?>> breakpoints = myBreakpoints.values();
List<XBreakpointBase<?, ?, ?>> breakpoints = new ArrayList<XBreakpointBase<?, ?, ?>>();
breakpoints.addAll(myDefaultBreakpoints.values());
breakpoints.addAll(myBreakpoints.values());
return breakpoints.toArray(new XBreakpointBase[breakpoints.size()]);
}
@SuppressWarnings({"unchecked"})
@NotNull
public <B extends XBreakpoint<?>> Collection<? extends B> getBreakpoints(@NotNull final XBreakpointType<B,?> type) {
ApplicationManager.getApplication().assertReadAccessAllowed();
Collection<? extends XBreakpointBase<?,?,?>> breakpoints = myBreakpoints.get(type);
if (breakpoints == null) {
return Collections.emptyList();
}
//noinspection unchecked
return Collections.unmodifiableCollection((Collection<? extends B>)breakpoints);
Collection<? extends B> regular = breakpoints != null ? Collections.unmodifiableCollection((Collection<? extends B>)breakpoints) : Collections.<B>emptyList();
final XBreakpointBase<?, ?, ?> defaultBreakpoint = myDefaultBreakpoints.get(type);
if (defaultBreakpoint == null) return regular;
List<B> result = new ArrayList<B>();
result.add((B)defaultBreakpoint);
result.addAll(regular);
return result;
}
@Nullable
@@ -196,6 +228,12 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
return null;
}
@Override
public boolean isDefaultBreakpoint(@NotNull XBreakpoint<?> breakpoint) {
//noinspection SuspiciousMethodCalls
return myDefaultBreakpoints.values().contains(breakpoint);
}
private <T extends XBreakpointProperties> EventDispatcher<XBreakpointListener> getOrCreateDispatcher(final XBreakpointType<?,T> type) {
EventDispatcher<XBreakpointListener> dispatcher = myDispatchers.get(type);
if (dispatcher == null) {
@@ -242,6 +280,12 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
public BreakpointManagerState getState() {
myDependentBreakpointManager.saveState();
BreakpointManagerState state = new BreakpointManagerState();
for (XBreakpointBase<?, ?, ?> breakpoint : myDefaultBreakpoints.values()) {
final XBreakpointBase.BreakpointState breakpointState = breakpoint.getState();
if (differsFromDefault(breakpoint.getType(), breakpointState)) {
state.getDefaultBreakpoints().add(breakpointState);
}
}
for (XBreakpointBase<?,?,?> breakpoint : myBreakpoints.values()) {
state.getBreakpoints().add(breakpoint.getState());
}
@@ -251,6 +295,19 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
return state;
}
private static <P extends XBreakpointProperties> boolean differsFromDefault(XBreakpointType<?, P> type,
XBreakpointBase.BreakpointState state) {
final P defaultProperties = type.createDefaultBreakpointProperties();
if (defaultProperties == null) {
return false;
}
XBreakpointBase.BreakpointState defaultState = new XBreakpointBase.BreakpointState(false, type.getId());
defaultState.setPropertiesElement(XmlSerializer.serialize(defaultProperties));
Element defaultElement = XmlSerializer.serialize(defaultState, SERIALIZATION_FILTER);
Element currentElement = XmlSerializer.serialize(state, SERIALIZATION_FILTER);
return !JDOMUtil.areElementsEqual(defaultElement, currentElement);
}
public void loadState(final BreakpointManagerState state) {
myBreakpointsDialogSettings.clear();
for (Map.Entry<String, XBreakpointTypeDialogState> entry : state.getBreakpointTypeDialogProperties().entrySet()) {
@@ -260,17 +317,41 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
}
}
removeAllBreakpoints();
for (XBreakpointBase.BreakpointState breakpointState : state.getBreakpoints()) {
XBreakpointBase<?,?,?> breakpoint = createBreakpoint(breakpointState);
if (breakpoint != null) {
addBreakpoint(breakpoint, false);
myDefaultBreakpoints.clear();
for (XBreakpointBase.BreakpointState breakpointState : state.getDefaultBreakpoints()) {
loadBreakpoint(breakpointState, true);
}
for (XBreakpointType<?, ?> type : XBreakpointUtil.getBreakpointTypes()) {
if (!myDefaultBreakpoints.containsKey(type)) {
addDefaultBreakpoint(type);
}
}
for (XBreakpointBase<?,?,?> breakpoint : myBreakpoints.values()) {
doRemoveBreakpoint(breakpoint);
}
for (XBreakpointBase.BreakpointState breakpointState : state.getBreakpoints()) {
loadBreakpoint(breakpointState, false);
}
myDependentBreakpointManager.loadState();
myLineBreakpointManager.updateBreakpointsUI();
}
private <P extends XBreakpointProperties> void addDefaultBreakpoint(XBreakpointType<?, P> type) {
final P properties = type.createDefaultBreakpointProperties();
if (properties != null) {
//noinspection unchecked
addBreakpoint((XBreakpointType<XBreakpoint<P>, P>)type, properties, true, false);
}
}
private void loadBreakpoint(XBreakpointBase.BreakpointState breakpointState, final boolean defaultBreakpoint) {
XBreakpointBase<?,?,?> breakpoint = createBreakpoint(breakpointState);
if (breakpoint != null) {
addBreakpoint(breakpoint, defaultBreakpoint, false);
}
}
@Nullable
public XBreakpointTypeDialogState getDialogState(@NotNull XBreakpointType<?, ?> type) {
return myBreakpointsDialogSettings.get(type);
@@ -280,27 +361,30 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
myBreakpointsDialogSettings.put(type, dialogState);
}
private void removeAllBreakpoints() {
for (XBreakpointBase<?,?,?> breakpoint : myBreakpoints.values()) {
removeBreakpoint(breakpoint);
}
}
@Nullable
private XBreakpointBase<?,?,?> createBreakpoint(final XBreakpointBase.BreakpointState breakpointState) {
XBreakpointType<?,?> type = XBreakpointUtil.findType(breakpointState.getTypeId());
if (type == null) return null;
if (type == null) return null;
//noinspection unchecked
return breakpointState.createBreakpoint(type, this);
}
@Tag("breakpoint-manager")
public static class BreakpointManagerState {
private List<XBreakpointBase.BreakpointState> myDefaultBreakpoints = new ArrayList<XBreakpointBase.BreakpointState>();
private List<XBreakpointBase.BreakpointState> myBreakpoints = new ArrayList<XBreakpointBase.BreakpointState>();
private Map<String, XBreakpointTypeDialogState> myBreakpointTypeDialogProperties = new HashMap<String, XBreakpointTypeDialogState>();
@Tag("default-breakpoints")
@AbstractCollection(surroundWithTag = false)
public List<XBreakpointBase.BreakpointState> getDefaultBreakpoints() {
return myDefaultBreakpoints;
}
@Tag("breakpoints")
@AbstractCollection(surroundWithTag = false, elementTypes = {XBreakpointBase.BreakpointState.class, XLineBreakpointImpl.LineBreakpointState.class})
@AbstractCollection(surroundWithTag = false,
elementTypes = {XBreakpointBase.BreakpointState.class, XLineBreakpointImpl.LineBreakpointState.class})
public List<XBreakpointBase.BreakpointState> getBreakpoints() {
return myBreakpoints;
}
@@ -316,6 +400,10 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
myBreakpoints = breakpoints;
}
public void setDefaultBreakpoints(List<XBreakpointBase.BreakpointState> defaultBreakpoints) {
myDefaultBreakpoints = defaultBreakpoints;
}
public void setBreakpointTypeDialogProperties(final Map<String, XBreakpointTypeDialogState> breakpointTypeDialogProperties) {
myBreakpointTypeDialogProperties = breakpointTypeDialogProperties;
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointsPanel.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class XBreakpointsPanel<B extends XBreakpoint<?>> extends AbstractBreakpo
myAllGroupingRules = new ArrayList<XBreakpointGroupingRule<B,?>>(myType.getGroupingRules());
mySelectedGroupingRules = getInitialGroupingRules();
myTree = XBreakpointsTree.createTree(myType, mySelectedGroupingRules, myParentDialog);
myTree = XBreakpointsTree.createTree(myType, mySelectedGroupingRules, myParentDialog, getBreakpointManager());
myTree.getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() {
public void valueChanged(final TreeSelectionEvent e) {
onSelectionChanged();
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointsTree.java
+16 -5
View File
@@ -25,6 +25,7 @@ import com.intellij.ui.SimpleTextAttributes;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.tree.TreeUtil;
import com.intellij.xdebugger.breakpoints.XBreakpoint;
import com.intellij.xdebugger.breakpoints.XBreakpointManager;
import com.intellij.xdebugger.breakpoints.XBreakpointType;
import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroup;
import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroupingRule;
@@ -53,11 +54,13 @@ public class XBreakpointsTree<B extends XBreakpoint<?>> extends CheckboxTree {
private final MultiValuesMap<XBreakpointGroupingRule<B, ?>, XBreakpointGroup> myGroups = new MultiValuesMap<XBreakpointGroupingRule<B,?>, XBreakpointGroup>();
private XBreakpointsTree(final XBreakpointType<B, ?> type, final CheckedTreeNode root,
Collection<XBreakpointGroupingRule<B, ?>> groupingRules, DialogWrapper parentDialog) {
Collection<XBreakpointGroupingRule<B, ?>> groupingRules,
DialogWrapper parentDialog,
XBreakpointManager breakpointManager) {
super(new BreakpointsTreeCellRenderer(), root);
myRoot = root;
myParentDialog = parentDialog;
myComparator = new TreeNodeComparator<B>(type);
myComparator = new TreeNodeComparator<B>(type, breakpointManager);
setGroupingRulesInternal(groupingRules);
}
@@ -68,8 +71,8 @@ public class XBreakpointsTree<B extends XBreakpoint<?>> extends CheckboxTree {
public static <B extends XBreakpoint<?>> XBreakpointsTree<B> createTree(final XBreakpointType<B, ?> type,
final Collection<XBreakpointGroupingRule<B, ?>> groupingRules,
DialogWrapper parentDialog) {
return new XBreakpointsTree<B>(type, new CheckedTreeNode("root"), groupingRules, parentDialog);
DialogWrapper parentDialog, XBreakpointManager breakpointManager) {
return new XBreakpointsTree<B>(type, new CheckedTreeNode("root"), groupingRules, parentDialog, breakpointManager);
}
public void buildTree(@NotNull Collection<? extends B> breakpoints) {
@@ -254,15 +257,23 @@ public class XBreakpointsTree<B extends XBreakpoint<?>> extends CheckboxTree {
private static class TreeNodeComparator<B extends XBreakpoint<?>> implements Comparator<TreeNode> {
private final Comparator<B> myBreakpointComparator;
private final XBreakpointManager myBreakpointManager;
public TreeNodeComparator(final XBreakpointType<B, ?> type) {
public TreeNodeComparator(final XBreakpointType<B, ?> type, XBreakpointManager breakpointManager) {
myBreakpointManager = breakpointManager;
myBreakpointComparator = type.getBreakpointComparator();
}
public int compare(final TreeNode o1, final TreeNode o2) {
if (o1 instanceof BreakpointNode && o2 instanceof BreakpointNode) {
//noinspection unchecked
B b1 = (B)((BreakpointNode)o1).getBreakpoint();
//noinspection unchecked
B b2 = (B)((BreakpointNode)o2).getBreakpoint();
boolean default1 = myBreakpointManager.isDefaultBreakpoint(b1);
boolean default2 = myBreakpointManager.isDefaultBreakpoint(b2);
if (default1 && !default2) return -1;
if (!default1 && default2) return 1;
return myBreakpointComparator.compare(b1, b2);
}
if (o1 instanceof BreakpointsGroupNode && o2 instanceof BreakpointsGroupNode) {
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/actions/RemoveBreakpointAction.java
+9 -2
View File
@@ -38,7 +38,12 @@ public class RemoveBreakpointAction<B extends XBreakpoint<?>> extends XBreakpoin
}
public boolean isEnabled(@NotNull final Collection<? extends B> breakpoints) {
return !breakpoints.isEmpty();
for (B breakpoint : breakpoints) {
if (!myBreakpointsPanel.getBreakpointManager().isDefaultBreakpoint(breakpoint)) {
return true;
}
}
return false;
}
public void perform(@NotNull final Collection<? extends B> breakpoints) {
@@ -46,7 +51,9 @@ public class RemoveBreakpointAction<B extends XBreakpoint<?>> extends XBreakpoin
new WriteAction() {
protected void run(final Result result) {
for (B breakpoint : breakpoints) {
breakpointManager.removeBreakpoint(breakpoint);
if (!breakpointManager.isDefaultBreakpoint(breakpoint)) {
breakpointManager.removeBreakpoint(breakpoint);
}
}
}
}.execute();
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
+1 -6
View File
@@ -63,7 +63,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
setOKButtonText(XDebuggerBundle.message("xdebugger.button.evaluate"));
setCancelButtonText(XDebuggerBundle.message("xdebugger.evaluate.dialog.close"));
myTreePanel = new XDebuggerTreePanel(session, editorsProvider, sourcePosition, XDebuggerActions.EVALUATE_DIALOG_TREE_POPUP_GROUP);
myTreePanel = new XDebuggerTreePanel(session, editorsProvider, myDisposable, sourcePosition, XDebuggerActions.EVALUATE_DIALOG_TREE_POPUP_GROUP);
myResultPanel = new JPanel(new BorderLayout());
myResultPanel.add(new JLabel(XDebuggerBundle.message("xdebugger.evaluate.label.result")), BorderLayout.NORTH);
myResultPanel.add(myTreePanel.getMainPanel(), BorderLayout.CENTER);
@@ -149,11 +149,6 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
myInputComponent.getInputEditor().selectAll();
}
protected void dispose() {
myTreePanel.dispose();
super.dispose();
}
protected String getDimensionServiceKey() {
return "#xdebugger.evaluate";
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java
+2 -1
View File
@@ -33,6 +33,7 @@ import com.intellij.xdebugger.evaluation.XDebuggerEvaluator;
import com.intellij.xdebugger.frame.XFullValueEvaluator;
import com.intellij.xdebugger.frame.XValue;
import com.intellij.xdebugger.frame.XValueNode;
import com.intellij.xdebugger.impl.actions.XDebuggerActions;
import com.intellij.xdebugger.impl.evaluate.quick.common.AbstractValueHint;
import com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType;
import com.intellij.xdebugger.impl.ui.DebuggerUIUtil;
@@ -142,7 +143,7 @@ public class XValueHint extends AbstractValueHint {
private void showTree(final XValue value, final String name) {
XDebuggerTree tree = new XDebuggerTree(myDebugSession, myDebugSession.getDebugProcess().getEditorsProvider(),
myDebugSession.getCurrentPosition());
myDebugSession.getCurrentPosition(), XDebuggerActions.VALUE_HINT_TREE_POPUP_GROUP);
tree.getModel().addTreeModelListener(createTreeListener(tree));
XValueHintTreeComponent component = new XValueHintTreeComponent(this, tree, Pair.create(value, name));
showTreePopup(component, tree, name);
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugViewBase.java
+3 -1
View File
@@ -15,10 +15,11 @@
*/
package com.intellij.xdebugger.impl.frame;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer;
import com.intellij.xdebugger.XDebugSession;
import com.intellij.xdebugger.XDebugSessionAdapter;
import com.intellij.xdebugger.impl.ui.DebuggerUIUtil;
import com.intellij.openapi.Disposable;
/**
* @author nik
@@ -32,6 +33,7 @@ public abstract class XDebugViewBase implements Disposable {
mySession = session;
mySessionListener = new MyDebugSessionListener();
mySession.addSessionListener(mySessionListener);
Disposer.register(parentDisposable, this);
}
public void rebuildView() {
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesView.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class XVariablesView extends XDebugViewBase {
public XVariablesView(@NotNull XDebugSession session, final Disposable parentDisposable) {
super(session, parentDisposable);
XDebuggerEditorsProvider editorsProvider = session.getDebugProcess().getEditorsProvider();
myDebuggerTreePanel = new XDebuggerTreePanel(session, editorsProvider, null, XDebuggerActions.VARIABLES_TREE_POPUP_GROUP);
myDebuggerTreePanel = new XDebuggerTreePanel(session, editorsProvider, this, null, XDebuggerActions.VARIABLES_TREE_POPUP_GROUP);
DnDManager.getInstance().registerSource(myDebuggerTreePanel, myDebuggerTreePanel.getTree());
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XWatchesView.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class XWatchesView extends XDebugViewBase implements DnDNativeTarget {
public XWatchesView(final XDebugSession session, final Disposable parentDisposable, final XDebugSessionData sessionData) {
super(session, parentDisposable);
myTreePanel = new XDebuggerTreePanel(session, session.getDebugProcess().getEditorsProvider(), null,
myTreePanel = new XDebuggerTreePanel(session, session.getDebugProcess().getEditorsProvider(), this, null,
XDebuggerActions.WATCHES_TREE_POPUP_GROUP);
ActionManager actionManager = ActionManager.getInstance();
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
+38 -6
View File
@@ -16,12 +16,11 @@
package com.intellij.xdebugger.impl.ui.tree;
import com.intellij.ide.dnd.aware.DnDAwareTree;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.DataKey;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.changes.issueLinks.TreeLinkMouseListener;
import com.intellij.ui.PopupHandler;
import com.intellij.ui.TreeSpeedSearch;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Convertor;
@@ -29,14 +28,18 @@ import com.intellij.xdebugger.XDebugSession;
import com.intellij.xdebugger.XSourcePosition;
import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
import com.intellij.xdebugger.frame.XDebuggerTreeNodeHyperlink;
import com.intellij.xdebugger.impl.actions.XDebuggerActions;
import com.intellij.xdebugger.impl.ui.tree.nodes.*;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.List;
@@ -44,7 +47,7 @@ import java.util.List;
/**
* @author nik
*/
public class XDebuggerTree extends DnDAwareTree implements DataProvider {
public class XDebuggerTree extends DnDAwareTree implements DataProvider, Disposable {
private static final DataKey<XDebuggerTree> XDEBUGGER_TREE_KEY = DataKey.create("xdebugger.tree");
private static final Convertor<TreePath,String> SPEED_SEARCH_CONVERTER = new Convertor<TreePath, String>() {
public String convert(TreePath o) {
@@ -67,8 +70,12 @@ public class XDebuggerTree extends DnDAwareTree implements DataProvider {
private XSourcePosition mySourcePosition;
private final List<XDebuggerTreeListener> myListeners = ContainerUtil.createEmptyCOWList();
private final XDebugSession mySession;
private final PopupHandler myPopupHandler;
public XDebuggerTree(final @NotNull XDebugSession session, final @NotNull XDebuggerEditorsProvider editorsProvider, final @Nullable XSourcePosition sourcePosition) {
public XDebuggerTree(final @NotNull XDebugSession session,
final @NotNull XDebuggerEditorsProvider editorsProvider,
final @Nullable XSourcePosition sourcePosition,
final @NotNull String popupActionGroupId) {
mySession = session;
myProject = session.getProject();
myEditorsProvider = editorsProvider;
@@ -104,6 +111,17 @@ public class XDebuggerTree extends DnDAwareTree implements DataProvider {
}
});
new TreeSpeedSearch(this, SPEED_SEARCH_CONVERTER);
final ActionManager actionManager = ActionManager.getInstance();
myPopupHandler = new PopupHandler() {
public void invokePopup(final Component comp, final int x, final int y) {
final ActionGroup group = (ActionGroup)actionManager.getAction(popupActionGroupId);
ActionPopupMenu popupMenu = actionManager.createActionPopupMenu(ActionPlaces.UNKNOWN, group);
popupMenu.getComponent().show(comp, x, y);
}
};
addMouseListener(myPopupHandler);
registerShortcuts();
}
public void addTreeListener(@NotNull XDebuggerTreeListener listener) {
@@ -187,6 +205,20 @@ public class XDebuggerTree extends DnDAwareTree implements DataProvider {
}
}
public void dispose() {
ActionManager actionManager = ActionManager.getInstance();
actionManager.getAction(XDebuggerActions.SET_VALUE).unregisterCustomShortcutSet(this);
actionManager.getAction(XDebuggerActions.COPY_VALUE).unregisterCustomShortcutSet(this);
actionManager.getAction(XDebuggerActions.JUMP_TO_SOURCE).unregisterCustomShortcutSet(this);
}
private void registerShortcuts() {
ActionManager actionManager = ActionManager.getInstance();
actionManager.getAction(XDebuggerActions.SET_VALUE).registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0)), this);
actionManager.getAction(XDebuggerActions.COPY_VALUE).registerCustomShortcutSet(CommonShortcuts.getCopy(), this);
actionManager.getAction(XDebuggerActions.JUMP_TO_SOURCE).registerCustomShortcutSet(CommonShortcuts.getEditSource(), this);
}
private static void markNodesObsolete(final XValueContainerNode<?> node) {
node.setObsolete();
List<XValueContainerNode<?>> loadedChildren = node.getLoadedChildren();
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreePanel.java
+6 -27
View File
@@ -19,16 +19,15 @@ import com.intellij.ide.dnd.DnDAction;
import com.intellij.ide.dnd.DnDDragStartBean;
import com.intellij.ide.dnd.DnDSource;
import com.intellij.ide.dnd.aware.DnDAwareTree;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Pair;
import com.intellij.ui.PopupHandler;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.treeStructure.Tree;
import com.intellij.xdebugger.XDebugSession;
import com.intellij.xdebugger.XDebuggerBundle;
import com.intellij.xdebugger.XSourcePosition;
import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
import com.intellij.xdebugger.impl.actions.XDebuggerActions;
import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -36,7 +35,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.KeyEvent;
/**
* @author nik
@@ -44,33 +42,14 @@ import java.awt.event.KeyEvent;
public class XDebuggerTreePanel implements DnDSource {
private final XDebuggerTree myTree;
private final JPanel myMainPanel;
private final PopupHandler myPopupHandler;
public XDebuggerTreePanel(final @NotNull XDebugSession session, final @NotNull XDebuggerEditorsProvider editorsProvider, final @Nullable XSourcePosition sourcePosition,
public XDebuggerTreePanel(final @NotNull XDebugSession session, final @NotNull XDebuggerEditorsProvider editorsProvider,
@NotNull Disposable parentDisposable, final @Nullable XSourcePosition sourcePosition,
@NotNull @NonNls final String popupActionGroupId) {
myTree = new XDebuggerTree(session, editorsProvider, sourcePosition);
myTree = new XDebuggerTree(session, editorsProvider, sourcePosition, popupActionGroupId);
myMainPanel = new JPanel(new BorderLayout());
myMainPanel.add(ScrollPaneFactory.createScrollPane(myTree), BorderLayout.CENTER);
final ActionManager actionManager = ActionManager.getInstance();
myPopupHandler = new PopupHandler() {
public void invokePopup(final Component comp, final int x, final int y) {
final ActionGroup group = (ActionGroup)actionManager.getAction(popupActionGroupId);
ActionPopupMenu popupMenu = actionManager.createActionPopupMenu(ActionPlaces.UNKNOWN, group);
popupMenu.getComponent().show(comp, x, y);
}
};
actionManager.getAction(XDebuggerActions.SET_VALUE).registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0)), myTree);
actionManager.getAction(XDebuggerActions.COPY_VALUE).registerCustomShortcutSet(CommonShortcuts.getCopy(), myTree);
actionManager.getAction(XDebuggerActions.JUMP_TO_SOURCE).registerCustomShortcutSet(CommonShortcuts.getEditSource(), myTree);
myTree.addMouseListener(myPopupHandler);
}
public void dispose() {
ActionManager actionManager = ActionManager.getInstance();
actionManager.getAction(XDebuggerActions.SET_VALUE).unregisterCustomShortcutSet(myTree);
actionManager.getAction(XDebuggerActions.JUMP_TO_SOURCE).unregisterCustomShortcutSet(myTree);
myTree.removeMouseListener(myPopupHandler);
Disposer.register(parentDisposable, myTree);
}
public XDebuggerTree getTree() {
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XInspectDialog.java
+1 -6
View File
@@ -38,7 +38,7 @@ public class XInspectDialog extends DialogWrapper {
super(session.getProject(), false);
setTitle(XDebuggerBundle.message("inspect.value.dialog.title", nodeName));
setModal(false);
myTreePanel = new XDebuggerTreePanel(session, editorsProvider, sourcePosition, XDebuggerActions.INSPECT_TREE_POPUP_GROUP);
myTreePanel = new XDebuggerTreePanel(session, editorsProvider, myDisposable, sourcePosition, XDebuggerActions.INSPECT_TREE_POPUP_GROUP);
XDebuggerTree tree = myTreePanel.getTree();
tree.setRoot(new XValueNodeImpl(tree, null, value), true);
init();
@@ -58,9 +58,4 @@ public class XInspectDialog extends DialogWrapper {
protected String getDimensionServiceKey() {
return "#xdebugger.XInspectDialog";
}
protected void dispose() {
myTreePanel.dispose();
super.dispose();
}
}
platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XBreakpointManagerTest.java
+47 -10
View File
@@ -35,12 +35,12 @@ public class XBreakpointManagerTest extends XBreakpointsTestCase {
assertSameElements(myBreakpointManager.getAllBreakpoints(), breakpoint, lineBreakpoint);
assertSame(lineBreakpoint, assertOneElement(myBreakpointManager.getBreakpoints(MY_LINE_BREAKPOINT_TYPE)));
assertSame(breakpoint, assertOneElement(myBreakpointManager.getBreakpoints(MY_SIMPLE_BREAKPOINT_TYPE)));
assertSame(breakpoint, getSingleBreakpoint());
myBreakpointManager.removeBreakpoint(lineBreakpoint);
assertSame(breakpoint, assertOneElement(myBreakpointManager.getAllBreakpoints()));
assertTrue(myBreakpointManager.getBreakpoints(MY_LINE_BREAKPOINT_TYPE).isEmpty());
assertSame(breakpoint, assertOneElement(myBreakpointManager.getBreakpoints(MY_SIMPLE_BREAKPOINT_TYPE)));
assertSame(breakpoint, getSingleBreakpoint());
myBreakpointManager.removeBreakpoint(breakpoint);
assertEquals(0, myBreakpointManager.getAllBreakpoints().length);
@@ -56,13 +56,14 @@ public class XBreakpointManagerTest extends XBreakpointsTestCase {
breakpoint.setLogMessage(true);
myBreakpointManager.addBreakpoint(MY_SIMPLE_BREAKPOINT_TYPE, new MyBreakpointProperties("123"));
Element element = save();
//System.out.println(JDOMUtil.writeElement(element, SystemProperties.getLineSeparator()));
load(element);
reload();
XBreakpoint<?>[] breakpoints = myBreakpointManager.getAllBreakpoints();
assertEquals(2, breakpoints.length);
assertEquals(3, breakpoints.length);
XLineBreakpoint lineBreakpoint = assertInstanceOf(breakpoints[0], XLineBreakpoint.class);
assertTrue(myBreakpointManager.isDefaultBreakpoint(breakpoints[0]));
assertEquals("default", assertInstanceOf(breakpoints[0].getProperties(), MyBreakpointProperties.class).myOption);
XLineBreakpoint lineBreakpoint = assertInstanceOf(breakpoints[1], XLineBreakpoint.class);
assertEquals(239, lineBreakpoint.getLine());
assertEquals("myurl", lineBreakpoint.getFileUrl());
assertEquals("abc", assertInstanceOf(lineBreakpoint.getProperties(), MyBreakpointProperties.class).myOption);
@@ -71,9 +72,36 @@ public class XBreakpointManagerTest extends XBreakpointsTestCase {
assertTrue(lineBreakpoint.isLogMessage());
assertEquals(SuspendPolicy.NONE, lineBreakpoint.getSuspendPolicy());
assertEquals("123", assertInstanceOf(breakpoints[1].getProperties(), MyBreakpointProperties.class).myOption);
assertEquals(SuspendPolicy.ALL, breakpoints[1].getSuspendPolicy());
assertFalse(breakpoints[1].isLogMessage());
assertEquals("123", assertInstanceOf(breakpoints[2].getProperties(), MyBreakpointProperties.class).myOption);
assertEquals(SuspendPolicy.ALL, breakpoints[2].getSuspendPolicy());
assertFalse(breakpoints[2].isLogMessage());
}
public void testDoNotSaveUnmodifiedDefaultBreakpoint() throws Exception {
reload();
assertEquals("default", getSingleBreakpoint().getProperties().myOption);
Element element = save();
assertEquals(0, element.getContent().size());
}
public void testSaveEnabledDefaultBreakpoint() throws Exception {
reload();
final XBreakpoint<MyBreakpointProperties> breakpoint = getSingleBreakpoint();
breakpoint.setEnabled(true);
assertFalse(save().getContent().isEmpty());
reload();
assertTrue(getSingleBreakpoint().isEnabled());
}
public void testSaveDefaultBreakpointWithModifiedProperties() throws Exception {
reload();
getSingleBreakpoint().getProperties().myOption = "changed";
assertFalse(save().getContent().isEmpty());
reload();
assertEquals("changed", getSingleBreakpoint().getProperties().myOption);
}
public void testListener() throws Exception {
@@ -106,4 +134,13 @@ public class XBreakpointManagerTest extends XBreakpointsTestCase {
myBreakpointManager.addLineBreakpoint(MY_LINE_BREAKPOINT_TYPE, "url", 239, new MyBreakpointProperties("a"));
assertEquals("", out.toString());
}
private XBreakpoint<MyBreakpointProperties> getSingleBreakpoint() {
return assertOneElement(myBreakpointManager.getBreakpoints(MY_SIMPLE_BREAKPOINT_TYPE));
}
private void reload() {
Element element = save();
load(element);
}
}
platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestCase.java
+5
View File
@@ -88,6 +88,11 @@ public abstract class XDebuggerTestCase extends PlatformLiteFixture {
public MyBreakpointProperties createProperties() {
return new MyBreakpointProperties();
}
@Override
public MyBreakpointProperties createDefaultBreakpointProperties() {
return new MyBreakpointProperties("default");
}
}
protected static class MyBreakpointProperties extends XBreakpointProperties<MyBreakpointProperties> {
plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class GithubUtil {
public static List<RepositoryInfo> getAvailableRepos(final String login, final String password) {
try {
final HttpMethod method = doREST(login, password, "/repos/show/" + login, false);
final HttpMethod method = doREST(login, password, "/repos/watched/" + login, false);
final InputStream stream = method.getResponseBodyAsStream();
final Element element = new SAXBuilder(false).build(stream).getRootElement();
final List repositories = element.getChildren();
resources-en/src/tips/tips.xml
+77 -46
View File
@@ -3,75 +3,105 @@
<tip file="NotReadyYet.html"/>
-->
<tip file="Welcome.html"/>
<tip file="GoToClass.html"/> <!--covered-->
<tip file="CodeCompletion.html"/> <!--covered-->
<tip file="GoToClass.html"/>
<!--covered-->
<tip file="CodeCompletion.html"/>
<!--covered-->
<tip file="FindUsages.html"/>
<tip file="QuickJavaDoc.html"/> <!--covered-->
<tip file="GoToDeclaration.html"/> <!--covered-->
<tip file="FileStructurePopup.html"/> <!--covered-->
<tip file="QuickJavaDoc.html"/>
<!--covered-->
<tip file="GoToDeclaration.html"/>
<!--covered-->
<tip file="FileStructurePopup.html"/>
<!--covered-->
<tip file="Rename.html"/>
<tip file="OverrideImplementMethods.html"/> <!--covered-->
<tip file="SmartTypeCompletion.html"/> <!--covered-->
<tip file="TabInLookups.html"/> <!--covered-->
<tip file="TabInEditorClose.html"/>
<tip file="OverrideImplementMethods.html"/>
<!--covered-->
<tip file="SmartTypeCompletion.html"/>
<!--covered-->
<tip file="TabInLookups.html"/>
<!--covered-->
<tip file="TabInEditorClose.html"/>
<tip file="AltInsertInEditor.html"/>
<!--<tip file="ClosingTabsWithMiddleMouse.html"/>-->
<tip file="SelectIn.html"/> <!--covered-->
<tip file="SpeedSearch.html"/> <!--covered-->
<tip file="SelectIn.html"/>
<!--covered-->
<tip file="SpeedSearch.html"/>
<!--covered-->
<tip file="Escape.html"/>
<tip file="SurroundWith.html"/> <!--covered-->
<tip file="SmartTypeAfterNew.html"/> <!--covered-->
<tip file="SmartTypeAnonymous.html"/> <!--covered-->
<tip file="GoToImplementation.html"/> <!--covered-->
<tip file="CtrlW.html"/> <!--covered-->
<tip file="IntroduceVariable.html"/> <!--covered-->
<tip file="ClassNameCompletion.html"/> <!--covered-->
<tip file="CommentCode.html"/> <!--covered-->
<tip file="SurroundWith.html"/>
<!--covered-->
<tip file="SmartTypeAfterNew.html"/>
<!--covered-->
<tip file="SmartTypeAnonymous.html"/>
<!--covered-->
<tip file="GoToImplementation.html"/>
<!--covered-->
<tip file="CtrlW.html"/>
<!--covered-->
<tip file="IntroduceVariable.html"/>
<!--covered-->
<tip file="ClassNameCompletion.html"/>
<!--covered-->
<tip file="CommentCode.html"/>
<!--covered-->
<!--<tip file="DisableBulb.html"/>-->
<tip file="ExternalJavaDoc.html"/> <!--covered-->
<tip file="SmartTypeCasting.html"/> <!--covered-->
<tip file="ExternalJavaDoc.html"/>
<!--covered-->
<tip file="SmartTypeCasting.html"/>
<!--covered-->
<tip file="CtrlD.html"/>
<tip file="LiveTemplates.html"/>
<tip file="VariableNameCompletion.html"/> <!--covered-->
<tip file="VariableNameCompletion.html"/>
<!--covered-->
<tip file="ParameterInfo.html"/>
<tip file="JumpToLastEdit.html"/>
<tip file="HighlightUsagesInFile.html"/>
<tip file="LayoutCode.html"/>
<tip file="LocalVCS.html"/>
<tip file="ContextInfo.html"/>
<tip file="RecentFiles.html"/> <!--covered-->
<tip file="RecentFiles.html"/>
<!--covered-->
<tip file="NextPrevError.html"/>
<tip file="InsertLiveTemplate.html"/>
<tip file="MethodSeparators.html"/>
<tip file="CamelHumpsInCodeCompletion.html"/> <!--covered-->
<tip file="CamelHumpsInCodeCompletion.html"/>
<!--covered-->
<tip file="MethodUpDown.html"/>
<tip file="JoinLines.html"/>
<tip file="CopyClass.html"/> <!--covered-->
<tip file="CopyClass.html"/>
<!--covered-->
<tip file="ClipboardStack.html"/>
<tip file="HierarchyBrowser.html"/>
<tip file="BreakpointSpeedmenu.html"/>
<tip file="EvaluateExpressionInEditor.html"/>
<tip file="WordCompletion.html"/>
<tip file="QuickJavaDocInLookups.html"/> <!--covered-->
<tip file="DotEtcInLookups.html"/> <!--covered-->
<tip file="QuickJavaDocInLookups.html"/>
<!--covered-->
<tip file="DotEtcInLookups.html"/>
<!--covered-->
<tip file="MenuItemsDescriptions.html"/>
<tip file="WildcardsInNavigationPopups.html"/>
<tip file="MoveInnerToUpper.html"/>
<tip file="IntroduceVariableIncompleteCode.html"/>
<!--<tip file="CreateTargetTag.html"/>-->
<tip file="GoToSymbol.html"/>
<tip file="RecentChanges.html"/> <!--covered-->
<tip file="RecentChanges.html"/>
<!--covered-->
<tip file="ImageFileCompletion.html"/>
<tip file="CreatePropertyTag.html"/>
<tip file="QuickSwitchScheme.html"/> <!--covered-->
<tip file="QuickSwitchScheme.html"/>
<!--covered-->
<tip file="CompleteStatement.html"/>
<tip file="CamelPrefixesInNavigationPopups.html"/>
<tip file="CtrlShiftI.html"/> <!--covered-->
<tip file="CtrlShiftI.html"/>
<!--covered-->
<tip file="CompletionInHTML.html"/>
<tip file="CopyPasteReference.html"/>
<tip file="MoveUpDown.html"/>
<tip file="SelectRunDebugConfiguration.html"/>
<tip file="CtrlShiftIForLookup.html"/> <!--covered-->
<tip file="CtrlShiftIForLookup.html"/>
<!--covered-->
<tip file="PropertiesCompletion.html"/>
<tip file="ShowAppliedStyles.html"/>
<tip file="ImagesLookup.html"/>
@@ -82,21 +112,22 @@
<tip file="MavenQuickOpen.html"/>
<tip file="MoveToChangelist.html"/>
<tip file="EclipseQuickOpen.html"/>
<tip file="ShowUsages.html"/>
<tip file="GoToAction.html"/>
<tip file="SearchInSettings.html"/>
<tip file="CompleteMethod.html"/>
<tip file="HighlightImplements.html"/>
<tip file="RecentSearch.html"/>
<tip file="CodeCompletionInSearch.html"/>
<tip file="HighlightMethodExitPoint.html"/>
<tip file="HighlightThrows.html"/>
<tip file="QuickFixRightArrow.html"/>
<tip file="NavigateToFilePath.html"/>
<tip file="IssueNavigation.html"/>
<tip file="UmlClassDiagram.html"/>
<tip file="ColorEditingInCss.html"/>
<tip file="CreateTestIntentionAction.html"/>
<tip file="ShowUsages.html"/>
<tip file="GoToAction.html"/>
<tip file="GoToInspection.html"/>
<tip file="SearchInSettings.html"/>
<tip file="CompleteMethod.html"/>
<tip file="HighlightImplements.html"/>
<tip file="RecentSearch.html"/>
<tip file="CodeCompletionInSearch.html"/>
<tip file="HighlightMethodExitPoint.html"/>
<tip file="HighlightThrows.html"/>
<tip file="QuickFixRightArrow.html"/>
<tip file="NavigateToFilePath.html"/>
<tip file="IssueNavigation.html"/>
<tip file="UmlClassDiagram.html"/>
<tip file="ColorEditingInCss.html"/>
<tip file="CreateTestIntentionAction.html"/>
<tip file="ColumnSelection.html"/>
<tip file="ColorFiles.html"/>
<tip file="CopyWithNoSelection.html"/>
resources/src/ProductivityFeaturesRegistry.xml
+7 -1
View File
@@ -78,6 +78,12 @@
min-usage-count="3"
first-show="5"
successive-show="5"/>
<feature
id="navigation.goto.inspection"
tip-file="GoToInspection.html"
min-usage-count="3"
first-show="5"
successive-show="5"/>
</group>
<group id="completion">
@@ -454,4 +460,4 @@
successive-show="10"
min-usage-count="1"/>
</group>
</component>
</component>
resources/src/idea/IdeaActions.xml
+1
View File
@@ -125,6 +125,7 @@
<group id="InspectCodeGroup" text="Inspect Code Actions">
<action id="InspectCode" class="com.intellij.codeInspection.actions.CodeInspectionAction"/>
<action id="RunInspection" class="com.intellij.codeInspection.actions.RunInspectionAction" />
<action id="InferNullity" class="com.intellij.codeInspection.inferNullity.InferNullityAnnotationsAction"/>
<action id="ViewOfflineInspection" class="com.intellij.codeInspection.actions.ViewOfflineResultsAction"/>
<add-to-group group-id="AnalyzeMenu" anchor="first"/>