Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/DartCorrectionProcessor.java

Issue 10828169: 'Split && condition' quick assist. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/DartCorrectionProcessor.java
diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/DartCorrectionProcessor.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/DartCorrectionProcessor.java
index 60e228ffb9e3db5725402243c01129cde7158b77..9551f85cb4bf1aa3764f836b795331752e85fe3f 100644
--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/DartCorrectionProcessor.java
+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/DartCorrectionProcessor.java
@@ -19,6 +19,7 @@ import com.google.dart.tools.core.model.CompilationUnit;
import com.google.dart.tools.internal.corext.refactoring.util.Messages;
import com.google.dart.tools.ui.DartToolsPlugin;
import com.google.dart.tools.ui.DartUI;
+import com.google.dart.tools.ui.internal.text.correction.proposals.ChangeCorrectionProposal;
import com.google.dart.tools.ui.internal.text.correction.proposals.MarkerResolutionProposal;
import com.google.dart.tools.ui.internal.text.editor.IJavaAnnotation;
import com.google.dart.tools.ui.text.dart.CompletionProposalComparator;
@@ -44,6 +45,7 @@ import org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext;
import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.IAnnotationModel;
import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.ltk.core.refactoring.NullChange;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IMarkerHelpRegistry;
import org.eclipse.ui.IMarkerResolution;
@@ -259,7 +261,6 @@ public class DartCorrectionProcessor implements
Collection<IDartCompletionProposal> proposals) {
List<ProblemLocation> problems = Lists.newArrayList();
- // TODO(scheglov) restore later
// collect problem locations and corrections from marker annotations
for (int i = 0; i < annotations.length; i++) {
Annotation curr = annotations[i];
@@ -537,15 +538,9 @@ public class DartCorrectionProcessor implements
@Override
public boolean canFix(Annotation annotation) {
- // TODO(scheglov) restore later
- return false;
-// return hasCorrections(annotation);
+ return hasCorrections(annotation);
}
- /*
- * @see IContentAssistProcessor#computeCompletionProposals(ITextViewer, int)
- */
- @SuppressWarnings("unchecked")
@Override
public ICompletionProposal[] computeQuickAssistProposals(
IQuickAssistInvocationContext quickAssistContext) {
@@ -584,11 +579,11 @@ public class DartCorrectionProcessor implements
}
}
- // TODO(scheglov) restore later
-// if (res == null || res.length == 0) {
-// return new ICompletionProposal[] {new ChangeCorrectionProposal(
-// CorrectionMessages.NoCorrectionProposal_description, new NullChange(""), 0, null)}; //$NON-NLS-1$
-// }
+ if (res == null || res.length == 0) {
+ return new ICompletionProposal[] {new ChangeCorrectionProposal(
+ CorrectionMessages.NoCorrectionProposal_description,
+ new NullChange(""), 0, null)}; //$NON-NLS-1$
+ }
if (res.length > 1) {
Arrays.sort(res, new CompletionProposalComparator());
}

Powered by Google App Engine
This is Rietveld 408576698