-
Notifications
You must be signed in to change notification settings - Fork 731
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate commonmark extension to kotlin
- Loading branch information
Showing
12 changed files
with
190 additions
and
255 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 0 additions & 55 deletions
55
matrix-sdk-android/src/main/java/org/commonmark/ext/maths/InlineMaths.java
This file was deleted.
Oops, something went wrong.
39 changes: 39 additions & 0 deletions
39
matrix-sdk-android/src/main/java/org/commonmark/ext/maths/InlineMaths.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/* | ||
* Copyright (c) 2020 New Vector Ltd | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.commonmark.ext.maths | ||
|
||
import org.commonmark.node.CustomNode | ||
import org.commonmark.node.Delimited | ||
|
||
class InlineMaths(private val delimiter: InlineDelimiter) : CustomNode(), Delimited { | ||
enum class InlineDelimiter { | ||
SINGLE_DOLLAR, ROUND_BRACKET_ESCAPED | ||
} | ||
|
||
override fun getOpeningDelimiter(): String { | ||
return when (delimiter) { | ||
InlineDelimiter.SINGLE_DOLLAR -> "$" | ||
InlineDelimiter.ROUND_BRACKET_ESCAPED -> "\\(" | ||
} | ||
} | ||
|
||
override fun getClosingDelimiter(): String { | ||
return when (delimiter) { | ||
InlineDelimiter.SINGLE_DOLLAR -> "$" | ||
InlineDelimiter.ROUND_BRACKET_ESCAPED -> "\\)" | ||
} | ||
} | ||
} |
51 changes: 0 additions & 51 deletions
51
matrix-sdk-android/src/main/java/org/commonmark/ext/maths/MathsExtension.java
This file was deleted.
Oops, something went wrong.
38 changes: 38 additions & 0 deletions
38
matrix-sdk-android/src/main/java/org/commonmark/ext/maths/MathsExtension.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/* | ||
* Copyright (c) 2020 New Vector Ltd | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.commonmark.ext.maths | ||
|
||
import org.commonmark.Extension | ||
import org.commonmark.ext.maths.internal.DollarMathsDelimiterProcessor | ||
import org.commonmark.ext.maths.internal.MathsHtmlNodeRenderer | ||
import org.commonmark.parser.Parser | ||
import org.commonmark.renderer.html.HtmlRenderer | ||
|
||
class MathsExtension private constructor() : Parser.ParserExtension, HtmlRenderer.HtmlRendererExtension { | ||
override fun extend(parserBuilder: Parser.Builder) { | ||
parserBuilder.customDelimiterProcessor(DollarMathsDelimiterProcessor()) | ||
} | ||
|
||
override fun extend(rendererBuilder: HtmlRenderer.Builder) { | ||
rendererBuilder.nodeRendererFactory { context -> MathsHtmlNodeRenderer(context) } | ||
} | ||
|
||
companion object { | ||
fun create(): Extension { | ||
return MathsExtension() | ||
} | ||
} | ||
} |
66 changes: 0 additions & 66 deletions
66
...ndroid/src/main/java/org/commonmark/ext/maths/internal/DollarMathsDelimiterProcessor.java
This file was deleted.
Oops, something went wrong.
53 changes: 53 additions & 0 deletions
53
...-android/src/main/java/org/commonmark/ext/maths/internal/DollarMathsDelimiterProcessor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* Copyright (c) 2020 New Vector Ltd | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.commonmark.ext.maths.internal | ||
|
||
import org.commonmark.ext.maths.DisplayMaths | ||
import org.commonmark.ext.maths.InlineMaths | ||
import org.commonmark.node.Text | ||
import org.commonmark.parser.delimiter.DelimiterProcessor | ||
import org.commonmark.parser.delimiter.DelimiterRun | ||
|
||
class DollarMathsDelimiterProcessor : DelimiterProcessor { | ||
override fun getOpeningCharacter(): Char { | ||
return '$' | ||
} | ||
|
||
override fun getClosingCharacter(): Char { | ||
return '$' | ||
} | ||
|
||
override fun getMinLength(): Int { | ||
return 1 | ||
} | ||
|
||
override fun getDelimiterUse(opener: DelimiterRun, closer: DelimiterRun): Int { | ||
return if (opener.length() == 1 && closer.length() == 1) 1 // inline | ||
else if (opener.length() == 2 && closer.length() == 2) 2 // display | ||
else 0 | ||
} | ||
|
||
override fun process(opener: Text, closer: Text, delimiterUse: Int) { | ||
val maths = if (delimiterUse == 1) InlineMaths(InlineMaths.InlineDelimiter.SINGLE_DOLLAR) else DisplayMaths(DisplayMaths.DisplayDelimiter.DOUBLE_DOLLAR) | ||
var tmp = opener.next | ||
while (tmp != null && tmp !== closer) { | ||
val next = tmp.next | ||
maths.appendChild(tmp) | ||
tmp = next | ||
} | ||
opener.insertAfter(maths) | ||
} | ||
} |
50 changes: 0 additions & 50 deletions
50
...ix-sdk-android/src/main/java/org/commonmark/ext/maths/internal/MathsHtmlNodeRenderer.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.