Align onEnterRule#indent JSON loading with vscode specification

See https://code.visualstudio.com/api/language-extensions/language-configuration-guide#on-enter-rules Signed-off-by: azerr <azerr@redhat.com>
eclipse-tm4e · Sep 7, 2022 · 40893cb · 40893cb
1 parent 972061a
commit 40893cb
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/...tion/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/model/EnterAction.java b/...tion/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/model/EnterAction.java
@@ -42,6 +42,26 @@ public enum IndentAction {
 		 * indentation).
 		 */
 		Outdent;
+
+		public static IndentAction get(@Nullable String value) {
+			// see
+			// https://github.com/microsoft/vscode/blob/13ba7bb446a638d37ebccb1a7d74e31c32bb9790/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts#L341
+			if (value == null) {
+				return IndentAction.None;	
+			}
+			switch (value) {
+			case "none":
+				return IndentAction.None;
+			case "indent":
+				return IndentAction.Indent;
+			case "indentOutdent":
+				return IndentAction.IndentOutdent;
+			case "outdent":
+				return IndentAction.Outdent;
+			default:
+				return IndentAction.None;
+			}
+		}
 	}
 
 	/**

diff --git a/...ain/java/org/eclipse/tm4e/languageconfiguration/internal/model/LanguageConfiguration.java b/...ain/java/org/eclipse/tm4e/languageconfiguration/internal/model/LanguageConfiguration.java
@@ -26,6 +26,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 /**
  * The language configuration interface defines the contract between extensions and various editor features, like
@@ -62,10 +63,10 @@ public static LanguageConfiguration load(@NonNull final Reader reader) {
 					final var actionElem = jsonObj.get("action"); //$NON-NLS-1$
 					if (actionElem != null && actionElem.isJsonObject()) {
 						final var actionJsonObj = actionElem.getAsJsonObject();
-						final var indentActionString = getAsString(actionJsonObj.get("indentAction")); //$NON-NLS-1$
+						final var indentActionString = getAsString(actionJsonObj.get("indent")); //$NON-NLS-1$
 						if (indentActionString != null) {
 							final var afterText = getAsPattern(jsonObj.get("afterText")); //$NON-NLS-1$
-							final var indentAction = IndentAction.valueOf(indentActionString);
+							final var indentAction = IndentAction.get(indentActionString);
 							final var removeText = getAsInteger(actionJsonObj.get("removeText")); //$NON-NLS-1$
 							final var appendText = getAsString(actionJsonObj.get("appendText")); //$NON-NLS-1$
 							final var action = new EnterAction(indentAction);
@@ -205,11 +206,29 @@ public static LanguageConfiguration load(@NonNull final Reader reader) {
 	}
 
 	@Nullable
-	private static Pattern getAsPattern(@Nullable final JsonElement element) {
-		final var pattern = getAsString(element);
+	private static Pattern getAsPattern(@Nullable final JsonElement element) {		
+		final var pattern = getPattern(element);
 		return pattern == null ? null : RegExpUtils.create(pattern);
 	}
 
+	@Nullable
+	private static String getPattern(@Nullable final JsonElement element) {
+		if (element == null) {
+			return null;
+		}
+		if (element.isJsonObject()) {
+			// ex : { "pattern": "^<\\/([_:\\w][_:\\w-.\\d]*)\\s*>", "flags": "i" }
+			var pattern = getAsString(((JsonObject) element).get("pattern"));
+			if (pattern == null) {
+				return null;
+			}
+			var flags = getAsString(((JsonObject) element).get("flags"));
+			return flags != null ? pattern + "(?" + flags + ")" : pattern;
+		}
+		// ex : "^<\\/([_:\\w][_:\\w-.\\d]*)\\s*>"
+		return getAsString(element);
+	}
+
 	@Nullable
 	private static String getAsString(@Nullable final JsonElement element) {
 		if (element == null) {