Skip to content

Commit d204ce7

Browse files
committed
Do not throw exception in case of non-concrete AbstractCodeMining type
1 parent a22c353 commit d204ce7

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private static enum CodeMiningMode {
248248
public static CodeMiningMode createFor(List<ICodeMining> minings) {
249249
Assert.isNotNull(minings);
250250

251-
CodeMiningMode mode= CodeMiningMode.InLine;
251+
CodeMiningMode mode= CodeMiningMode.HeaderLine;
252252
if (!minings.isEmpty()) {
253253
ICodeMining first= minings.get(0);
254254

@@ -258,8 +258,6 @@ public static CodeMiningMode createFor(List<ICodeMining> minings) {
258258
mode= CodeMiningMode.HeaderLine;
259259
} else if (CodeMiningMode.FooterLine.codeMiningType.isInstance(first)) {
260260
mode= CodeMiningMode.FooterLine;
261-
} else {
262-
throw new IllegalStateException("Unexpected code mining type: " + first.getClass()); //$NON-NLS-1$
263261
}
264262
}
265263
return mode;

examples/org.eclipse.jface.text.examples/src/org/eclipse/jface/text/examples/codemining/MultilineCodeMiningProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.eclipse.jface.text.IDocument;
2020
import org.eclipse.jface.text.ITextViewer;
2121
import org.eclipse.jface.text.Position;
22+
import org.eclipse.jface.text.codemining.AbstractCodeMining;
2223
import org.eclipse.jface.text.codemining.AbstractCodeMiningProvider;
2324
import org.eclipse.jface.text.codemining.ICodeMining;
24-
import org.eclipse.jface.text.codemining.LineContentCodeMining;
2525
import org.eclipse.jface.text.codemining.LineHeaderCodeMining;
2626

2727
public class MultilineCodeMiningProvider extends AbstractCodeMiningProvider {
@@ -35,7 +35,7 @@ public CompletableFuture<List<? extends ICodeMining>> provideCodeMinings(ITextVi
3535
int index = 0;
3636
while ((index = document.get().indexOf(multiLineText, index)) != -1) {
3737
index += multiLineText.length();
38-
res.add(new LineContentCodeMining(new Position(index, 1), this, null) {
38+
res.add(new AbstractCodeMining(new Position(index, 1), this, null) {
3939
@Override
4040
public String getLabel() {
4141
return "multiline first part in same line";

tests/org.eclipse.ui.editors.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTestProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.eclipse.jface.text.BadLocationException;
2020
import org.eclipse.jface.text.ITextViewer;
2121
import org.eclipse.jface.text.Position;
22+
import org.eclipse.jface.text.codemining.AbstractCodeMining;
2223
import org.eclipse.jface.text.codemining.AbstractCodeMiningProvider;
2324
import org.eclipse.jface.text.codemining.ICodeMining;
2425
import org.eclipse.jface.text.codemining.ICodeMiningProvider;
@@ -49,7 +50,7 @@ public String getLabel() {
4950
});
5051
}
5152
if (provideContentMiningAtOffset >= 0) {
52-
minings.add(new LineContentCodeMining(new Position(provideContentMiningAtOffset, 1), this, null) {
53+
minings.add(new AbstractCodeMining(new Position(provideContentMiningAtOffset, 1), this, null) {
5354
@Override
5455
public String getLabel() {
5556
return "Content mining";

0 commit comments

Comments
 (0)