From d52e3260b3a197fc653f5122ba3c8056d27b7a0d Mon Sep 17 00:00:00 2001 From: Michael Camilleri Date: Tue, 28 Jan 2020 05:14:22 +0900 Subject: [PATCH 1/3] Update ID regexs to match against Unicode --- lib/rouge/lexers/java.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/rouge/lexers/java.rb b/lib/rouge/lexers/java.rb index 22e1b6bc14..14b2a691ce 100644 --- a/lib/rouge/lexers/java.rb +++ b/lib/rouge/lexers/java.rb @@ -23,9 +23,9 @@ class Java < RegexLexer types = %w(boolean byte char double float int long short var void) - id = /[a-zA-Z_][a-zA-Z0-9_]*/ - const_name = /[A-Z][A-Z0-9_]*\b/ - class_name = /[A-Z][a-zA-Z0-9]*\b/ + id = /[[:alpha:]_][[:word:]]*/ + const_name = /[[:upper:]][[:upper:][:digit:]_]*\b/ + class_name = /[[:upper:]][[:alnum:]]*\b/ state :root do rule %r/[^\S\n]+/, Text From b642a03fedb93df4ab675e49d9e2fb30b089e681 Mon Sep 17 00:00:00 2001 From: Michael Camilleri Date: Tue, 28 Jan 2020 05:14:46 +0900 Subject: [PATCH 2/3] Add Unicode test to visual sample --- spec/visual/samples/java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec/visual/samples/java b/spec/visual/samples/java index f4c4eb1906..42705392dc 100644 --- a/spec/visual/samples/java +++ b/spec/visual/samples/java @@ -680,3 +680,6 @@ public class PlatformManagerImpl implements PlatformManager { } } + +// Permit Unicode characters in identifiers +getHauptadresse().setStraßePostfach("Am Hundsacker 6"); From eb1f05b252a4fedf449d4f05f4ab26145fef80fe Mon Sep 17 00:00:00 2001 From: Michael Camilleri Date: Tue, 28 Jan 2020 05:26:36 +0900 Subject: [PATCH 3/3] Add example with ASCII identifiers only --- spec/visual/samples/java | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/visual/samples/java b/spec/visual/samples/java index 42705392dc..bdee76e041 100644 --- a/spec/visual/samples/java +++ b/spec/visual/samples/java @@ -682,4 +682,5 @@ public class PlatformManagerImpl implements PlatformManager } // Permit Unicode characters in identifiers +getHauptadresse().setPLZ("91126"); getHauptadresse().setStraßePostfach("Am Hundsacker 6");