Skip to content

Commit 8e8e7e9

Browse files
committed
custom lang , web implementation fixed
1 parent 4abd04f commit 8e8e7e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+437
-302
lines changed

.github/workflows/docs.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.gitignore

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,41 @@ atlassian-ide-plugin.xml
8686
com_crashlytics_export_strings.xml
8787
crashlytics.properties
8888
crashlytics-build.properties
89-
*.iml
89+
90+
.gradle
91+
!gradle/wrapper/gradle-wrapper.jar
92+
!**/src/main/**/build/
93+
!**/src/test/**/build/
94+
95+
### IntelliJ IDEA ###
96+
.idea/modules.xml
97+
.idea/jarRepositories.xml
98+
.idea/compiler.xml
99+
.idea/libraries/
100+
out/
101+
!**/src/main/**/out/
102+
!**/src/test/**/out/
103+
104+
### Eclipse ###
105+
.apt_generated
106+
.classpath
107+
.factorypath
108+
.project
109+
.settings
110+
.springBeans
111+
.sts4-cache
112+
!**/src/main/**/bin/
113+
!**/src/test/**/bin/
114+
115+
### NetBeans ###
116+
/nbproject/private/
117+
/nbbuild/
118+
/dist/
119+
/nbdist/
120+
/.nb-gradle/
121+
122+
### VS Code ###
123+
.vscode/
124+
125+
### Mac OS ###
126+
.DS_Store

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/model/CodeLang.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ enum class CodeLang(val langProvider: Prettify.LangProvider?, val value: List<St
1818
JavaScript(null, listOf("javascript")),
1919
CoffeeScript(null, listOf("coffee")),
2020
Rust(null, listOf("rust")),
21+
OCAML(null, listOf("ml")),
22+
SML(null, listOf("ml")),
23+
FSharp(null, listOf("fs")),
24+
JSON(null,listOf("json")),
25+
XML(null,listOf("xml")),
26+
Proto(null,listOf("proto")),
27+
RegEx(null,listOf("regex")),
2128
Appollo({ LangAppollo() },LangAppollo.fileExtensions),
2229
Basic({ LangBasic() },LangBasic.fileExtensions),
2330
Clojure({ LangClj() },LangClj.fileExtensions),
@@ -31,9 +38,6 @@ enum class CodeLang(val langProvider: Prettify.LangProvider?, val value: List<St
3138
Lua({ LangLua() },LangLua.fileExtensions),
3239
Matlab({ LangMatlab() },LangMatlab.fileExtensions),
3340
ML({ LangMl() },LangMl.fileExtensions),
34-
OCAML(null, listOf("ml")),
35-
SML(null, listOf("ml")),
36-
FSharp(null, listOf("fs")),
3741
Mumps({ LangMumps() },LangMumps.fileExtensions),
3842
N({ LangN() },LangN.fileExtensions),
3943
Pascal({ LangPascal() },LangPascal.fileExtensions),
@@ -49,10 +53,6 @@ enum class CodeLang(val langProvider: Prettify.LangProvider?, val value: List<St
4953
XQuery({ LangXq() },LangXq.fileExtensions),
5054
YAML({ LangYaml() },LangYaml.fileExtensions),
5155
Markdown({ LangMd() },LangMd.fileExtensions),
52-
JSON(null,listOf("json")),
53-
XML(null,listOf("xml")),
54-
Proto(null,listOf("proto")),
55-
RegEx(null,listOf("regex")),
5656
Ex({ LangEx() },LangEx.fileExtensions),
5757
Kotlin({ LangKotlin() },LangKotlin.fileExtensions),
5858
Lasso({ LangLasso() },LangLasso.fileExtensions),

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/prettify/PrettifyParser.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.wakaztahir.codeeditor.prettify.parser.Prettify
1212
*/
1313
class PrettifyParser : Parser {
1414

15-
private var prettify: Prettify = Prettify()
15+
private val prettify: Prettify = Prettify()
1616

1717
override fun parse(fileExtension: String, content: String): List<ParseResult> =
1818
parse(prettify.getLexerForExtension(fileExtension), content)

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/prettify/lang/Lang.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ abstract class Lang {
2626
/**
2727
* Similar to those in JavaScript prettify.js.
2828
*/
29-
internal abstract val shortcutStylePatterns: List<StylePattern>
29+
abstract val shortcutStylePatterns: List<StylePattern>
3030

3131
/**
3232
* Similar to those in JavaScript prettify.js.
3333
*/
34-
internal abstract val fallthroughStylePatterns: List<StylePattern>
34+
abstract val fallthroughStylePatterns: List<StylePattern>
3535

3636
abstract fun getFileExtensions(): List<String>
3737
}

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/prettify/lang/LangAppollo.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,17 @@ class LangAppollo : Lang() {
5050
shortcutStylePatterns.new(
5151
Prettify.PR_COMMENT,
5252
Regex("^#[^\r\n]*"),
53-
null,
54-
"#"
53+
null
5554
)
5655
// Whitespace
5756
shortcutStylePatterns.new(
58-
Prettify.PR_PLAIN, Regex("^[\t\n\r \\xA0]+"), null, "\t\n\r " + 0xA0.toChar().toString()
57+
Prettify.PR_PLAIN, Regex("^[\t\n\r \\xA0]+"), null
5958
)
6059
// A double quoted, possibly multi-line, string.
6160
shortcutStylePatterns.new(
6261
Prettify.PR_STRING,
6362
Regex("^\\\"(?:[^\\\"\\\\]|\\\\[\\s\\S])*(?:\\\"|$)"),
64-
null,
65-
"\""
63+
null
6664
)
6765
fallthroughStylePatterns.new(
6866
Prettify.PR_KEYWORD,

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/prettify/lang/LangBasic.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ class LangBasic : Lang() {
3131
shortcutStylePatterns.new(
3232
Prettify.PR_STRING,
3333
Regex("^(?:\"(?:[^\\\\\"\\r\\n]|\\\\.)*(?:\"|$))"),
34-
null,
35-
"\""
34+
null
3635
)
3736
// Whitespace
3837
shortcutStylePatterns.new(
39-
Prettify.PR_PLAIN, Regex("^\\s+"), null, "\t\n\r " + 0xA0.toChar().toString()
38+
Prettify.PR_PLAIN, Regex("^\\s+"), null
4039
)
4140

4241
// A line comment that starts with REM
@@ -56,8 +55,7 @@ class LangBasic : Lang() {
5655
fallthroughStylePatterns.new(
5756
Prettify.PR_LITERAL,
5857
Regex("^(?:\\d+(?:\\.\\d*)?|\\.\\d+)(?:e[+\\-]?\\d+)?", RegexOption.IGNORE_CASE),
59-
null,
60-
"0123456789"
58+
null
6159
)
6260
fallthroughStylePatterns.new(
6361
Prettify.PR_PUNCTUATION, Regex("^.[^\\s\\w\\.$%\"]*"), null

0 commit comments

Comments
 (0)