Merge pull request #54 from NixOS/highlighter

Improve highlighter
NixOS · Mar 13, 2023 · a9b80bc · a9b80bc
2 parents e2418db + 19972f9
commit a9b80bc
Show file tree

Hide file tree

Showing 24 changed files with 1,418 additions and 214 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 ### Added
+- Highlighting of built-in functions and constants
+- Support for [semantic highlighting](https://www.jetbrains.com/help/idea/configuring-colors-and-fonts.html#semantic-highlighting)
+- Settings to change the colors used by the highlighter
 
 ### Changed
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -97,6 +97,12 @@ gradle.buildFinished {
 }
 
 tasks {
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+    }
+    withType<Javadoc> {
+        options.encoding = "UTF-8"
+    }
 
     task<Exec>("jbr") {
         description = "Create a symlink to package jetbrains.jdk"

diff --git a/src/main/java/org/nixos/idea/lang/NixSyntaxHighlighter.java b/src/main/java/org/nixos/idea/lang/NixSyntaxHighlighter.java