oysteikt-skolearbeid/TDT4100-project
oysteikt-skolearbeid/TDT4100-project
1
0
Fork 0
Code Issues Pull Requests Activity

Fix language pattern randomness issue

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit 2021-04-24 22:29:52 +02:00
parent 2e397fd971
commit f235ab1f75
3 changed files with 188 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/app/model/languages/Java.java
View File

@ -3,7 +3,10 @@ package app.model.languages;
import java.net.URL;
import java.util.AbstractMap;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
import java.util.Map.Entry;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@ -30,11 +33,12 @@ public class Java implements ProgrammingLanguage {
};
private static Entry<Pattern, String> e(String k, String v) {
return new AbstractMap.SimpleEntry<>(Pattern.compile(k), v);
return new SimpleEntry<>(Pattern.compile(k), v);
}
private static final Map<Pattern, String> pattern =
Map.ofEntries(
private static final List<Entry<Pattern, String>> patternList =
List.of(
e("\"([^\"\\\\]|\\\\.)*\"", "string"),
e("\\bthis\\b", "this"),
e("\\btrue\\b", "true"),
@ -51,6 +55,14 @@ public class Java implements ProgrammingLanguage {
e("(?://.*)|/\\*(?:\\n|.)*?\\*/", "comment")
);
private static Map<Pattern, String> pattern;
public Java() {
pattern = new LinkedHashMap<>();
patternList
.forEach(e -> pattern.put(e.getKey(), e.getValue()));
}
public String getName() {
return this.name;
}
@ -60,6 +72,7 @@ public class Java implements ProgrammingLanguage {
}
public Map<Pattern, String> getPatternMap() {
return Java.pattern;
}

14
src/main/java/app/model/languages/Markdown.java
View File

@ -3,6 +3,8 @@ package app.model.languages;
import java.net.URL;
import java.util.AbstractMap;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Pattern;
@ -19,8 +21,8 @@ public class Markdown implements ProgrammingLanguage {
return new AbstractMap.SimpleEntry<>(Pattern.compile(k), v);
}
private static final Map<Pattern, String> pattern =
Map.ofEntries(
private static final List<Entry<Pattern, String>> patternList =
List.of(
e("<!--(?:.|\n)*-->", "comment"),
e("##### .*", "ssssheader"),
e("#### .*", "sssheader"),
@ -38,6 +40,14 @@ public class Markdown implements ProgrammingLanguage {
e("\\[\\d+\\]: .*", "source")
);
private static Map<Pattern, String> pattern;
public Markdown() {
pattern = new LinkedHashMap<>();
patternList
.forEach(e -> pattern.put(e.getKey(), e.getValue()));
}
public String getName() {
return this.name;
}

160
src/test/java/app/service/LanguageOperationsTest.java Normal file
View File

@ -0,0 +1,160 @@
package app.service;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Collection;
import java.util.Collections;
import org.fxmisc.richtext.model.StyleSpan;
import org.fxmisc.richtext.model.StyleSpans;
import org.fxmisc.richtext.model.StyleSpansBuilder;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import app.model.languages.Java;
public class LanguageOperationsTest {
private String javaCode =
"""
class TestClass {
// This is a comment
private int myInt = 1;
/*
* This is a longer comment
*/
public int getMyInt() {
return this.myInt;
}
public static void main(String[] args) {
TestClass class = new TestClass();
System.out.println(class.getMyInt());
System.out.println(\"This is a string\");
System.out.println(true);
}
}
""";
private StyleSpan<Collection<String>> s(String style, int length) {
return new StyleSpan<Collection<String>>(Collections.singleton(style), length);
}
private StyleSpan<Collection<String>> s(int length) {
return new StyleSpan<Collection<String>>(Collections.emptyList(), length);
}
private StyleSpans<Collection<String>> javaStyle =
new StyleSpansBuilder<Collection<String>>()
.add(s("keyword", 5))
.add(s(1))
.add(s("identifier", 9))
.add(s(1))
.add(s("curlyBrackets", 1))
.add(s(3))
.add(s("comment", 20))
.add(s(3))
.add(s("keyword", 7))
.add(s(1))
.add(s("keyword", 3))
.add(s(10))
.add(s("semicolon", 1))
.add(s(4))
.add(s("comment", 36))
.add(s(3))
.add(s("keyword", 6))
.add(s(1))
.add(s("keyword", 3))
.add(s(1))
.add(s("method", 8))
.add(s("paranthesis", 2))
.add(s(1))
.add(s("curlyBrackets", 1))
.add(s(5))
.add(s("keyword", 6))
.add(s(1))
.add(s("this", 4))
.add(s("property", 6))
.add(s("semicolon", 1))
.add(s(3))
.add(s("curlyBrackets", 1))
.add(s(4))
.add(s("keyword", 6))
.add(s(1))
.add(s("keyword", 6))
.add(s(1))
.add(s("keyword", 4))
.add(s(1))
.add(s("method", 4))
.add(s("paranthesis", 1))
.add(s("identifier", 6))
.add(s("squareBrackets", 2))
.add(s(5))
.add(s("paranthesis", 1))
.add(s(1))
.add(s("curlyBrackets", 1))
.add(s(5))
.add(s("identifier", 9))
.add(s(1))
.add(s("keyword", 5))
.add(s(3))
.add(s("keyword", 3))
.add(s(1))
.add(s("method", 9))
.add(s("paranthesis", 2))
.add(s("semicolon", 1))
.add(s(5))
.add(s("identifier", 6))
.add(s("property", 4))
.add(s(1))
.add(s("method", 7))
.add(s("paranthesis", 1))
.add(s("keyword", 5))
.add(s(1))
.add(s("method", 8))
.add(s("paranthesis", 3))
.add(s("semicolon", 1))
.add(s(5))
.add(s("identifier", 6))
.add(s("property", 4))
.add(s(1))
.add(s("method", 7))
.add(s("paranthesis", 1))
.add(s("string", 18))
.add(s("paranthesis", 1))
.add(s("semicolon", 1))
.add(s(5))
.add(s("identifier", 6))
.add(s("property", 4))
.add(s(1))
.add(s("method", 7))
.add(s("paranthesis", 1))
.add(s("true", 4))
.add(s("paranthesis", 1))
.add(s("semicolon", 1))
.add(s(3))
.add(s("curlyBrackets", 1))
.add(s(1))
.add(s("curlyBrackets", 1))
.add(s(1))
.create();
@Test
@DisplayName("")
public void testSyntaxHighlighting() {
StyleSpans<Collection<String>> highlightData =
LanguageOperations.syntaxHighlight(javaCode, new Java());
// highlightData.forEach(sp ->
// System.out.println(
// sp.getStyle().isEmpty()
// ? String.format(".add(s(%d))", sp.getLength())
// : String.format(".add(s(\"%s\", %d))", sp.getStyle().toArray()[0], sp.getLength())
// )
// );
assertEquals(javaStyle, highlightData);
}
}