Skip to content

#40 Syntax highlighting not working correctly with non ascii text #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tfesenko wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#40 Syntax highlighting not working correctly with non ascii text #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36b891a
#40 - tests for accented characters in keys
tfesenko Mar 29, 2017
1546a6c
#40 - allow accented characters in the keys
tfesenko Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions org.dadacoalition.yedit.test/scanner-test-files/key-accented-chars-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
name: Parsing keys with accented characters
contentFile: key-accented-chars.yaml
rangeLength: -1
startOffset: 0
expectedTokens:

- type: DOCUMENT_START

# Poèmes
- type: WHITESPACE
- type: KEY

# Poème1
- type: WHITESPACE
- type: KEY

- type: WHITESPACE
- type: KEY
- type: WHITESPACE
- type: SCALAR

- type: WHITESPACE
- type: KEY
- type: WHITESPACE
- type: SCALAR

- type: WHITESPACE
- type: KEY
- type: WHITESPACE
- type: SCALAR

# Prop2
- type: WHITESPACE
- type: KEY

- type: WHITESPACE
- type: KEY
- type: WHITESPACE
- type: SCALAR

9 changes: 9 additions & 0 deletions org.dadacoalition.yedit.test/scanner-test-files/key-accented-chars.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
Poèmes:
Poème1:
MaîtreCorbeau: value
SurUnArbrePerché: value
î: value
Prop2:
grünen: value

3 changes: 2 additions & 1 deletion org.dadacoalition.yedit.test/src/org/dadacoalition/yedit/test/scanner/YAMLScannerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ public static Collection<Object[]> readTests() {
"comment-tests.yaml",
"tag-tests.yaml",
"scalar-test.yaml",
"key-tests.yaml"
"key-tests.yaml",
"key-accented-chars-tests.yaml"
};

Collection<Object[]> testCases = new ArrayList<Object[]>();
Expand Down
4 changes: 2 additions & 2 deletions org.dadacoalition.yedit/src/org/dadacoalition/yedit/editor/scanner/KeyRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
*/
public class KeyRule implements IRule {

private IToken token;
private IToken token;
private Pattern keyPattern;

public KeyRule( IToken token ){
this.token = token;
keyPattern = Pattern.compile( getKeyRegex(), Pattern.DOTALL | Pattern.COMMENTS );
keyPattern = Pattern.compile( getKeyRegex(), Pattern.DOTALL | Pattern.COMMENTS | Pattern.UNICODE_CHARACTER_CLASS);
}

public IToken evaluate(ICharacterScanner scanner) {
Expand Down