Merge pull request #11 from Softwee/feature/highlight.markdown

Added Markdown support

Author: kbiakov

codeview/build.gradle

@@ -27,11 +27,9 @@ dependencies {
  testCompile 'junit:junit:4.12'
 
  compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: '1.0.3'
 
  compile 'com.android.support:appcompat-v7:24.2.0'
  compile 'com.android.support:recyclerview-v7:24.2.0'
- compile 'com.github.twalcari:java-prettify:1.2.2'
 }
 repositories {
  mavenCentral()

codeview/src/main/java/io/github/kbiakov/codeview/CodeView.kt

@@ -111,7 +111,7 @@ class CodeView : RelativeLayout {
  return rvCodeContent.adapter as AbstractCodeAdapter<*>
  }
  set(adapter) {
- delayed { // to prevent UI overhead & initialization inconsistency
+ delayed { // prevent UI overhead & initialization inconsistency
  rvCodeContent.adapter = adapter
  state = ViewState.PRESENTED
  }

codeview/src/main/java/io/github/kbiakov/codeview/highlight/CodeHighlighter.kt

@@ -1,8 +1,8 @@
 package io.github.kbiakov.codeview.highlight
 
 import android.graphics.Color
-import prettify.PrettifyParser
-import syntaxhighlight.ParseResult
+import io.github.kbiakov.codeview.highlight.prettify.PrettifyParser
+import io.github.kbiakov.codeview.highlight.parser.ParseResult
 import java.util.*
 
 /**
@@ -34,9 +34,9 @@ object CodeHighlighter {
  val highlighted = StringBuilder()
 
  results.forEach { result ->
- val color = getColor(colorsMap, result)
+ val color = colorsMap.getColor(result)
  val content = parseContent(source, result)
- highlighted.append("<font color=\"$color\">$content</font>")
+ highlighted.append(content.withFontParams(color))
  }
 
  return highlighted.toString()
@@ -60,12 +60,11 @@ object CodeHighlighter {
  /**
  * Color accessor from built color map for selected color theme.
  *
- * @param colorsMap Colors map built from color theme
  * @param result Syntax unit
  * @return Color for syntax unit
  */
- private fun getColor(colorsMap: HashMap<String, String>, result: ParseResult) =
- colorsMap[result.styleKeys[0]] ?: colorsMap["pln"]
+ private fun HashMap<String, String>.getColor(result: ParseResult) =
+ this[result.styleKeys[0]] ?: this["pln"]
 
  /**
  * Build fast accessor (as map) for selected color theme.
@@ -200,9 +199,7 @@ data class SyntaxColors(
  val attrValue: Int = 0x269186)
 
 /**
- * Convert hex int to color by adding alpha-channel.
- *
- * @return Color int
+ * @return Converted hex int to color by adding alpha-channel
  */
 fun Int.color() = try {
  Color.parseColor("#FF${Integer.toHexString(this)}")
@@ -211,8 +208,55 @@ fun Int.color() = try {
 }
 
 /**
- * Convert hex int to hex string.
- *
- * @return Hex string
+ * @return Converted hex int to hex string
  */
 fun Int.hex() = "#${Integer.toHexString(this)}"
+
+/**
+ * @return Is value equals to found or not condition
+ */
+fun Int.isFound() = this >= 0
+fun Int.notFound() = this == -1
+
+/**
+ * @return String with applied font params
+ */
+fun String.withFontParams(color: String?): String {
+ val parametrizedString = StringBuilder()
+
+ var idx = 0
+ var newIdx = indexOf("\n")
+
+ if (newIdx.notFound()) // covers expected tag coverage (within only one line)
+ parametrizedString.append(inFontTag(color))
+ else { // may contain multiple lines with line breaks
+
+ // put tag on the borders (end & start of line, ..., end of tag)
+ while (newIdx.isFound()) { // until closing tag is reached
+ val part = substring(idx..newIdx).inFontTag(color)
+ parametrizedString.append(part)
+
+ idx = newIdx
+ newIdx = indexOf("\n", idx + 1)
+ }
+
+ if (idx != indexOf("\n")) // if not replaced only once (for multiline tag coverage)
+ parametrizedString.append(substring(idx).inFontTag(color))
+ }
+
+ return parametrizedString.toString()
+}
+
+/**
+ * @return String with escaped line break at start
+ */
+fun String.escLineBreakAtStart() =
+ if (startsWith("\n") && length >= 2)
+ substring(1)
+ else this
+
+/**
+ * @return String surrounded by font tag
+ */
+fun String.inFontTag(color: String?) =
+ "<font color=\"$color\">${escLineBreakAtStart()}</font>"

codeview/src/main/java/io/github/kbiakov/codeview/highlight/parser/ParseResult.java

@@ -0,0 +1,175 @@
+// Copyright (c) 2012 Chan Wai Shing
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+package io.github.kbiakov.codeview.highlight.parser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The parser parsed result.
+ * 
+ * This class include the information needed to highlight the syntax. 
+ * Information includes where the content located in the document (offset and 
+ * length) and what style(s) should be applied on that segment of content.
+ * 
+ * @author Chan Wai Shing <cws1989@gmail.com>
+ */
+public class ParseResult {
+
+ /**
+ * The start position of the content.
+ */
+ protected int offset;
+ /**
+ * The length of the content.
+ */
+ protected int length;
+ /**
+ * The style keys of the content. The style at higher index of the list will 
+ * override the style of the lower index.
+ */
+ protected List<String> styleKeys;
+
+ /**
+ * Constructor.
+ * 
+ * @param offset the start position of the content
+ * @param length the length of the content
+ * @param styleKeys the style keys of the content
+ */
+ public ParseResult(int offset, int length, List<String> styleKeys) {
+ this.offset = offset;
+ this.length = length;
+ this.styleKeys = new ArrayList<String>(styleKeys);
+ }
+
+ /**
+ * The start position of the content.
+ * @return the start position of the content
+ */
+ public int getOffset() {
+ return offset;
+ }
+
+ /**
+ * The start position of the content.
+ * @param offset the start position of the content
+ */
+ public void setOffset(int offset) {
+ this.offset = offset;
+ }
+
+ /**
+ * The length of the content.
+ * @return the length of the content
+ */
+ public int getLength() {
+ return length;
+ }
+
+ /**
+ * The length of the content.
+ * @param length the length of the content
+ */
+ public void setLength(int length) {
+ this.length = length;
+ }
+
+ /**
+ * Get the style keys represented by one string key, see 
+ * {@link Theme#getStylesAttributeSet(String)}.
+ * @return the style keys of the content
+ */
+ public String getStyleKeysString() {
+ StringBuilder sb = new StringBuilder(10);
+ for (int i = 0, iEnd = styleKeys.size(); i < iEnd; i++) {
+ if (i != 0) {
+ sb.append(" ");
+ }
+ sb.append(styleKeys.get(i));
+ }
+ return sb.toString();
+ }
+
+ /**
+ * The style keys of the content.
+ * @param styleKeys the style keys of the content
+ */
+ public void setStyleKeys(List<String> styleKeys) {
+ this.styleKeys = new ArrayList<String>(styleKeys);
+ }
+
+ /**
+ * The style keys of the content.
+ * @param styleKey the style key
+ * @return see the return value of {@link List#add(Object)}
+ */
+ public boolean addStyleKey(String styleKey) {
+ return styleKeys.add(styleKey);
+ }
+
+ /**
+ * The style keys of the content.
+ * @param styleKey the style key
+ * @return see the return value of {@link List#remove(Object)}
+ */
+ public boolean removeStyleKey(String styleKey) {
+ return styleKeys.remove(styleKey);
+ }
+
+ /**
+ * The style keys of the content.
+ */
+ public void clearStyleKeys() {
+ styleKeys.clear();
+ }
+
+ /**
+ * The style keys for this matched result, see {@link syntaxhighlighter.theme}.
+ * @return the style keys
+ */
+ public List<String> getStyleKeys() {
+ return new ArrayList<String>(styleKeys);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("[");
+ sb.append(offset);
+ sb.append("; ");
+ sb.append(length);
+ sb.append("; ");
+ for (int i = 0, iEnd = styleKeys.size(); i < iEnd; i++) {
+ if (i != 0) {
+ sb.append(", ");
+ }
+ sb.append(styleKeys.get(i));
+ }
+ sb.append("]");
+
+ return sb.toString();
+ }
+}

codeview/src/main/java/io/github/kbiakov/codeview/highlight/parser/Parser.java

@@ -0,0 +1,40 @@
+// Copyright (c) 2012 Chan Wai Shing
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+package io.github.kbiakov.codeview.highlight.parser;
+
+import java.util.List;
+
+/**
+ * The parser for syntax highlight.
+ * 
+ * @author Chan Wai Shing <cws1989@gmail.com>
+ */
+public interface Parser {
+
+ /**
+ * Parse the {@code content} and return the parsed result.
+ * @param fileExtension the file extension of the content, null means not 
+ * provided
+ * @param content the content
+ * @return the parsed result
+ */
+ List<ParseResult> parse(String fileExtension, String content);
+}

codeview/src/main/java/io/github/kbiakov/codeview/highlight/prettify/PrettifyParser.java

@@ -0,0 +1,48 @@
+package io.github.kbiakov.codeview.highlight.prettify;
+
+import io.github.kbiakov.codeview.highlight.prettify.parser.Job;
+import io.github.kbiakov.codeview.highlight.prettify.parser.Prettify;
+import io.github.kbiakov.codeview.highlight.parser.ParseResult;
+import io.github.kbiakov.codeview.highlight.parser.Parser;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * The prettify parser for syntax highlight.
+ * @author Chan Wai Shing <cws1989@gmail.com>
+ */
+public class PrettifyParser implements Parser {
+
+ /**
+ * The prettify parser.
+ */
+ protected Prettify prettify;
+
+ /**
+ * Constructor.
+ */
+ public PrettifyParser() {
+ prettify = new Prettify();
+ }
+
+ @Override
+ public List<ParseResult> parse(String fileExtension, String content) {
+ Job job = new Job(0, content);
+ prettify.langHandlerForExtension(fileExtension, content).decorate(job);
+ List<Object> decorations = job.getDecorations();
+
+
+ List<ParseResult> returnList = new ArrayList<ParseResult>();
+
+ // apply style according to the style list
+ for (int i = 0, iEnd = decorations.size(); i < iEnd; i += 2) {
+ int endPos = i + 2 < iEnd ? (Integer) decorations.get(i + 2) : content.length();
+ int startPos = (Integer) decorations.get(i);
+ returnList.add(new ParseResult(startPos, endPos - startPos, Arrays.asList(new String[]{(String) decorations.get(i + 1)})));
+ }
+
+ return returnList;
+ }
+}