提交: de8d33f14d21eee0c3258a5251b3dc649fbf70a1 - Moxkiriya7 (git)

Moxkiriyaプロジェクト事前開発用の作業部屋

Commit MetaInfo

• 修订版: de8d33f14d21eee0c3258a5251b3dc649fbf70a1 (tree)
• 时间: 2018-09-01 11:54:33
• 作者: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• 外部リンク/内部リンクのネストをなるべく正しく処理するように修正
  

更改概述

• modified: src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
• modified: src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiExternalLinkInlineParser.java
• modified: src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiInternalLinkInlineParser.java

差异

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
@@ -935,13 +935,12 @@ public class WikiMainWindowController implements Initializable {
 							try {
 								MouseEvent  mouseEvent  = (MouseEvent)event;
 								EventTarget target      = mouseEvent.getCurrentTarget();
-								
 								if(isExternalLink(target) == true) {
-									externalLinkHandle(target);
 									/*
 									 * WebEngineのデフォルトの動作(リンク先ページをロード)をキャンセル
 									 */
-									event.preventDefault();
+									event.preventDefault();	
+									externalLinkHandle(target);
 								}
 								else {
 									internalLinkHandle(target);

--- a/src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiExternalLinkInlineParser.java
+++ b/src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiExternalLinkInlineParser.java
@@ -73,9 +73,8 @@ public class WikiExternalLinkInlineParser extends WikiInlineParserBase {
 		boolean isMatch = false;
 		
 		Matcher startMatcher
-			= Pattern.compile(WikiExternalLinkInlineParser.PATTERN_START)
-					.matcher(line);
-		
+			= Pattern.compile(WikiExternalLinkInlineParser.PATTERN_START).matcher(line);
+
 		if(startMatcher.find() == true) {
 			/*
 			 * PATTERN_STARTの開始位置を取得
@@ -84,21 +83,12 @@ public class WikiExternalLinkInlineParser extends WikiInlineParserBase {
 
 			/*
 			 * PATTERN_ENDの開始位置を取得
-			 */			
-			String   subline             = line.substring(startIndex + 1);
-			Matcher  endMatcher = Pattern.compile(WikiExternalLinkInlineParser.PATTERN_END)
-						.matcher(subline);
+			 */
+			String   startString = line.substring(startIndex + 1);
+			Matcher  endMatcher  = Pattern.compile(WikiExternalLinkInlineParser.PATTERN_END).matcher(startString);
 			
 			if(endMatcher.find() == true) {
-				/*
-				 * schemeチェック
-				 */
-				for(String scheme: schemeList) {
-					if(subline.startsWith(scheme) == true) {
-						isMatch = true;
-						break;
-					}
-				}			
+				isMatch = isSchemeString(startString);
 			}
 		}
 		
@@ -106,19 +96,91 @@ public class WikiExternalLinkInlineParser extends WikiInlineParserBase {
 	}
 
 	@Override
-	public String deleteWikiToken(String line) {
-		String deleteTop = line.replaceFirst(Pattern.quote(WIKI_TOKEN_START), "");
-		String text      = deleteTop.substring(0, deleteTop.lastIndexOf(WIKI_TOKEN_END));
-
-		if(text.contains("|") == true) {
-			url_      = text.substring(0, text.indexOf("|"));
-			textNode_ = text.substring(text.indexOf("|") + "|".length());
+	public String[] devideLine(String line) {
+		int      depth         = 0;
+		char[]   charArrayLine = line.toCharArray();
+		int      startIndex    = -1;
+		int      endIndex      = -1;
+		int      lastIndex     = -1;
+		boolean  withinElem    = false;
+		
+		for(int count = 0; count < charArrayLine.length; count++) {
+			if(charArrayLine[count] == '>') {
+				withinElem = false;
+				continue;
+			} else if(charArrayLine[count] == '<') {
+				withinElem = true;
+			}
+			
+			if(withinElem == true) {
+				/*
+				 * HTML要素内をスキップ
+				 */
+				continue;
+			}
+			
+			if(charArrayLine[count] == '[') {
+				String startString = line.substring(count + 1);
+				if(isSchemeString(startString) == true) {
+					if(startIndex != -1) {
+						/*
+						 * 次の外部リンクの開始の場合、
+						 */
+						endIndex = lastIndex;
+						break;
+					}
+					else if(depth == 0) {
+						startIndex = count;
+					}
+				}
+				else if(startString.startsWith("[")) {
+					/*
+					 * 内部リンクの開始に到達した場合、
+					 */
+					endIndex = lastIndex;
+					break;					
+				}
+				depth++;
+			}
+			else if(charArrayLine[count] == ']') {
+				lastIndex = count;
+				if(depth > 0) {
+					depth--;
+					
+					if(depth == 0) {
+						endIndex = count;
+						break;
+					}
+				}
+			}
 		}
-		else {
-			url_      = text;
-			textNode_ = text;
+
+		if(endIndex == -1) {
+			endIndex = (lastIndex == -1) ? line.length() - 1 : lastIndex;
 		}
-		return textNode_;
+
+		String split0 = line.substring(0, startIndex);
+		String split1 = line.substring(startIndex, endIndex + 1);
+		String split2 = line.substring(endIndex + 1);
+
+		return new String[] {split0, split1, split2};
+	}	
+
+	@Override
+	public String deleteWikiToken(String line) {
+        String deleteTop = line.replaceFirst(Pattern.quote(WIKI_TOKEN_START), "");
+        String text      = deleteTop.substring(0, deleteTop.lastIndexOf(WIKI_TOKEN_END));
+
+        if(text.contains("|") == true) {
+                url_      = text.substring(0, text.indexOf("|"));
+                textNode_ = text.substring(text.indexOf("|") + "|".length());
+        }
+        else {
+                url_      = text;
+                textNode_ = text;
+        }
+        return textNode_.replaceAll(Pattern.quote("["), "&#91;")
+        		.replaceAll(Pattern.quote("]"), "&#93;");
 	}
 
 	@Override
@@ -161,4 +223,22 @@ public class WikiExternalLinkInlineParser extends WikiInlineParserBase {
 	public String getEndPattern() {
 		return PATTERN_END;
 	}
+
+	/**
+	 * lineがscheme文字列で始まるか判定する。
+	 * @param line
+	 * @return 判定結果
+	 */
+	private static boolean isSchemeString(String line) {
+		boolean result = false;
+
+		for(String scheme: schemeList) {
+			if(line.startsWith(scheme) == true) {
+				result = true;
+				break;
+			}
+		}
+		
+		return result;
+	}
 }

--- a/src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiInternalLinkInlineParser.java
+++ b/src/com/wiki/standalone/moxkiriya/parser/inlineparser/WikiInternalLinkInlineParser.java
@@ -174,6 +174,55 @@ public class WikiInternalLinkInlineParser extends WikiInlineParserBase {
 	}
 
 	@Override
+	public String[] devideLine(String line) {
+		char[]   charArrayLine = line.toCharArray();
+		int      startIndex    = -1;
+		int      endIndex      = -1;
+		boolean  withinElem    = false;
+		
+		for(int count = 0; count < charArrayLine.length; count++) {
+			if(charArrayLine[count] == '>') {
+				withinElem = false;
+				continue;
+			} else if(charArrayLine[count] == '<') {
+				withinElem = true;
+			}
+			
+			if(withinElem == true) {
+				/*
+				 * HTML要素内をスキップ
+				 */
+				continue;
+			}
+
+			if(charArrayLine[count] == '[') {
+				String startString = line.substring(count);
+				if(startString.startsWith(WIKI_TOKEN_START) == true) {
+					startIndex = count;
+				}
+			}
+			else if(charArrayLine[count] == ']') {
+				if(startIndex != -1) {
+					String endString = line.substring(count);
+					if(endString.startsWith(WIKI_TOKEN_END) == true) {
+						endIndex = count;
+						break;
+					}
+				}
+			}
+		}
+		
+		String split0 = line.substring(0, startIndex);
+		String split1 = line.substring(startIndex, endIndex + 2);
+		String split2 = line.substring(endIndex + 2);
+		
+		return new String[] {split0.replaceAll(Pattern.quote("["), "&#91;")
+								.replaceAll(Pattern.quote("]"), "&#93;"),
+							 split1,
+							 split2};
+	}	
+
+	@Override
 	public String deleteWikiToken(String line) {
 		String deleteTop   = line.replaceFirst(Pattern.quote(WIKI_TOKEN_START), "");
 		String deleteToken = deleteTop.substring(0, deleteTop.lastIndexOf(WIKI_TOKEN_END));