From 054097689b08815b3587cee6955c143b1cc285e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Thu, 13 Apr 2017 20:25:08 +0200 Subject: [PATCH] Fix skipping of comments. --- .../hughes/android/dictionary/parser/WikiTokenizer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/hughes/android/dictionary/parser/WikiTokenizer.java b/src/com/hughes/android/dictionary/parser/WikiTokenizer.java index 8cf882e..9f3444f 100644 --- a/src/com/hughes/android/dictionary/parser/WikiTokenizer.java +++ b/src/com/hughes/android/dictionary/parser/WikiTokenizer.java @@ -527,14 +527,14 @@ public final class WikiTokenizer { if (tokenStack.size() > 0) { final String removed = tokenStack.remove(tokenStack.size() - 1); if (removed.equals("{{") && !matchText.equals("}}")) { - errors.add("Unmatched {{ error: " + wikiText.substring(start)); + errors.add("Unmatched {{ error: " + wikiText.substring(start, matchEnd)); return safeIndexOf(wikiText, start, "\n", "\n"); } else if (removed.equals("[[") && !matchText.equals("]]")) { - errors.add("Unmatched [[ error: " + wikiText.substring(start)); + errors.add("Unmatched [[ error: " + wikiText.substring(start, matchEnd)); return safeIndexOf(wikiText, start, "\n", "\n"); } } else { - errors.add("Pop too many error: " + wikiText.substring(start).replace("\n", "\\\\n")); + errors.add("Pop too many " + matchText + " error: " + wikiText.substring(start, matchEnd).replace("\n", "\\\\n")); // If we were looking for a newline return safeIndexOf(wikiText, start, "\n", "\n"); } @@ -549,7 +549,7 @@ public final class WikiTokenizer { // Do nothing. These can match spuriously, and if it's not the thing // we're looking for, keep on going. } else if (matchText.equals(""); + end = wikiText.indexOf("-->", matchStart); if (end == -1) { errors.add("Unmatched