Skip to content

Fix NPE on JSP Editor #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RoiSoleil wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix NPE on JSP Editor #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...tiv.tools.indentguide.plugin/src/main/java/net/certiv/tools/indentguide/painter/Line.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private boolean isCol0Comment(int num, String txt) {
if (txt.isBlank()) return false;

List<String> prefixes = prefixMap.get(Utils.partitionType(viewer, num));
return prefixes.stream().anyMatch(p -> txt.startsWith(p));
return prefixes != null && prefixes.stream().anyMatch(txt::startsWith);
}

/**
Expand Down
45 changes: 29 additions & 16 deletions ...ertiv.tools.indentguide.plugin/src/main/java/net/certiv/tools/indentguide/util/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.Objects;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.concurrent.Callable;
import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand All @@ -33,8 +34,8 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.jface.resource.StringConverter;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.ITextViewerExtension5;
Expand Down Expand Up @@ -105,12 +106,14 @@ private Utils() {}
public static Map<String, List<String>> prefixesFor(ISourceViewer viewer) throws Exception {
Map<String, List<String>> prefixes = new HashMap<>();
Map<String, String[]> map = getValue(viewer, PREFIXES);
map.forEach((k, v) -> {
List<String> vals = Arrays.stream(v) //
.filter(p -> p != null && !p.isBlank()) //
.toList();
prefixes.put(k, vals);
});
if(map != null) {
map.forEach((k, v) -> {
List<String> vals = Arrays.stream(v) //
.filter(p -> p != null && !p.isBlank()) //
.toList();
prefixes.put(k, vals);
});
}
return prefixes;
}

Expand Down Expand Up @@ -318,24 +321,34 @@ public static int lineHeight(Control comp, int lines) {
}

/**
* Return the partition type of the document held in the given viewer at the given
* line.
* Return the partition type of the document held in the given viewer at the given line.
*
* @param viewer text viewer
* @param line document line number
* @param line document line number
* @return partition type
*/
public static String partitionType(ITextViewer viewer, int line) {
try {
IDocument doc = viewer.getDocument();
if (doc != null && line > -1) {
return doc.getContentType(line);
IDocument doc = viewer.getDocument();
if (doc != null && line > -1) {
if (doc instanceof IDocumentExtension3 documentExtension3) {
return Arrays.stream(documentExtension3.getPartitionings()).map(partitioning -> safeContentTypeGetter(() -> documentExtension3.getContentType(partitioning, line, false)))
.filter(Objects::nonNull)
.findFirst()
.orElseGet(() -> safeContentTypeGetter(() -> doc.getContentType(line)));
}
} catch (BadLocationException e) {
return safeContentTypeGetter(() -> doc.getContentType(line));
}
return DefContentType;
}

private static <V> V safeContentTypeGetter(Callable<V> callable) {
try {
return callable.call();
} catch (Exception e) {
// Activator.log("Prefix analysis failure on line %d [%s].", line,
// e.getMessage());
}
return DefContentType;
return null;
}

/**
Expand Down