Fix #481 Add Rust syntax highlighting and code folding

bobbylight · Oct 18, 2023 · ca5157d · ca5157d
1 parent 2d7b80e
commit ca5157d
Show file tree

Hide file tree

Showing 13 changed files with 3,325 additions and 24 deletions.
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/DefaultTokenMakerFactory.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/DefaultTokenMakerFactory.java
@@ -70,6 70,7 @@ protected void initTokenMakerMap() {
  putMapping(SYNTAX_STYLE_PROPERTIES_FILE,pkg "PropertiesFileTokenMaker");
  putMapping(SYNTAX_STYLE_PYTHON, pkg "PythonTokenMaker");
  putMapping(SYNTAX_STYLE_RUBY, pkg "RubyTokenMaker");
  putMapping(SYNTAX_STYLE_RUST, pkg "RustTokenMaker");
  putMapping(SYNTAX_STYLE_SAS, pkg "SASTokenMaker");
  putMapping(SYNTAX_STYLE_SCALA, pkg "ScalaTokenMaker");
  putMapping(SYNTAX_STYLE_SQL, pkg "SQLTokenMaker");

diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java
@@ -293,6 293,12 @@ public interface SyntaxConstants {
  String SYNTAX_STYLE_RUBY = "text/ruby";
 
 
  /**
  * Style for highlighting Ruby.
  */
  String SYNTAX_STYLE_RUST = "text/rust";
 
 
  /**
  * Style for highlighting SAS keywords.
  */

diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java
@@ -98,6 98,7 @@ private Map<String, FoldParser> createFoldParserMap() {
  map.put(SYNTAX_STYLE_PHP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_PHP));
  map.put(SYNTAX_STYLE_PROTO, new CurlyFoldParser());
  map.put(SYNTAX_STYLE_PYTHON, new PythonFoldParser());
  map.put(SYNTAX_STYLE_RUST, new CurlyFoldParser());
  map.put(SYNTAX_STYLE_SCALA, new CurlyFoldParser());
  map.put(SYNTAX_STYLE_TYPESCRIPT, new CurlyFoldParser());
  map.put(SYNTAX_STYLE_XML, new XmlFoldParser());

diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.flex b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.flex
@@ -241,7 241,7 @@ import org.fife.ui.rsyntaxtextarea.*;
  * Returns the closest {@link TokenTypes} "standard" token type for a given
  * "internal" token type (e.g. one whose value is <code>&lt; 0</code>).
  */
-  @Override
  @Override
  public int getClosestStandardTokenTypeForInternalType(int type) {
  switch (type) {
  case INTERNAL_IN_JS_MLC:

diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.java