Skip to content

fix(languageconfiguration): support object-form line comments #1026

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

Merged
sebthom merged 1 commit into from
Aug 3, 2026
Merged

fix(languageconfiguration): support object-form line comments #1026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions ...ain/java/org/eclipse/tm4e/languageconfiguration/internal/model/LanguageConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,14 @@ private static String removeTrailingCommas(final String jsonString) {
return null;
}

// ex: {"lineComment": "//","blockComment": [ "/*", "*/" ]}
final var jsonObj = json.getAsJsonObject();
final var lineComment = getAsString(jsonObj.get("lineComment")); //$NON-NLS-1$
final var lineCommentElem = jsonObj.get("lineComment"); //$NON-NLS-1$
// VS Code also permits {"comment":"#","noIndent":true} here.
// TM4E always inserts line comments at the start of the line, so noIndent
// currently has no effect and is intentionally ignored.
final var lineComment = lineCommentElem != null && lineCommentElem.isJsonObject()
? getAsString(lineCommentElem.getAsJsonObject().get("comment")) //$NON-NLS-1$
: getAsString(lineCommentElem);
final var blockCommentElem = jsonObj.get("blockComment"); //$NON-NLS-1$
CharacterPair blockComment = null;
if (blockCommentElem != null && blockCommentElem.isJsonArray()) {
Expand Down
15 changes: 15 additions & 0 deletions ...tion/src/test/java/org/eclipse/tm4e/languageconfiguration/internal/model/ParsingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,21 @@ void testCanLoadRustLanguageConfig() throws Exception {
assertThat(languageConfiguration.getFolding()).isNull();
}

@Test
void testCanLoadObjectLineComment() {
final var languageConfiguration = loadLanguageConfigFromString("""
{
"comments": {
"lineComment": {
"comment": "#",
"noIndent": true
}
}
}""");

assertThat(castNonNull(languageConfiguration.getComments()).lineComment).isEqualTo("#");
}

@Test
void testLanguagePackLangConfigs() throws IOException {
final var count = new AtomicInteger();
Expand Down