Repository navigation
Support for language-configuration.json #9749
+5,889
−27
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| { | ||
| "comments": { | ||
| "lineComment": "//", | ||
| "blockComment": [ | ||
| "/*", | ||
| "*/" | ||
| ] | ||
| }, | ||
| "brackets": [ | ||
| [ | ||
| "{", | ||
| "}" | ||
| ], | ||
| [ | ||
| "[", | ||
| "]" | ||
| ], | ||
| [ | ||
| "(", | ||
| ")" | ||
| ] | ||
| ], | ||
| "autoClosingPairs": [ | ||
| { | ||
| "open": "[", | ||
| "close": "]" | ||
| }, | ||
| { | ||
| "open": "{", | ||
| "close": "}" | ||
| }, | ||
| { | ||
| "open": "(", | ||
| "close": ")" | ||
| }, | ||
| { | ||
| "open": "'", | ||
| "close": "'", | ||
| "notIn": [ | ||
| "string", | ||
| "comment" | ||
| ] | ||
| }, | ||
| { | ||
| "open": "\"", | ||
| "close": "\"", | ||
| "notIn": [ | ||
| "string" | ||
| ] | ||
| }, | ||
| { | ||
| "open": "/*", | ||
| "close": "*/", | ||
| "notIn": [ | ||
| "string", | ||
| "comment" | ||
| ] | ||
| }, | ||
| { | ||
| "open": "/**", | ||
| "close": " */", | ||
| "notIn": [ | ||
| "string" | ||
| ] | ||
| } | ||
| ], | ||
| "surroundingPairs": [ | ||
| [ | ||
| "{", | ||
| "}" | ||
| ], | ||
| [ | ||
| "[", | ||
| "]" | ||
| ], | ||
| [ | ||
| "(", | ||
| ")" | ||
| ], | ||
| [ | ||
| "\"", | ||
| "\"" | ||
| ], | ||
| [ | ||
| "'", | ||
| "'" | ||
| ], | ||
| [ | ||
| "<", | ||
| ">" | ||
| ] | ||
| ], | ||
| "wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\#\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)", | ||
| "folding": { | ||
| "markers": { | ||
| "start": "^\\s*#\\s*pragma\\s+region\\b", | ||
| "end": "^\\s*#\\s*pragma\\s+endregion\\b" | ||
| } | ||
| }, | ||
| "indentationRules": { | ||
| "decreaseIndentPattern": { | ||
| "pattern": "^\\s*[\\}\\]\\)].*$" | ||
| }, | ||
| "increaseIndentPattern": { | ||
| "pattern": "^.*(\\{[^}]*|\\([^)]*|\\[[^\\]]*)$" | ||
| }, | ||
| }, | ||
| "onEnterRules": [ | ||
| { | ||
| // Decrease indentation after single line if/else if/else, for, or while | ||
| "previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$", | ||
| // But make sure line doesn't have braces or is not another if statement | ||
| "beforeText": "^\\s+([^{i\\s]|i(?!f\\b))", | ||
| "action": { | ||
| "indent": "outdent" | ||
| } | ||
| }, | ||
| // Add // when pressing enter from inside line comment | ||
| { | ||
| "beforeText": "^\\s*//\\s*\\S|\\s//\\s+\\S", | ||
| "afterText": "^(?!\\s*$)", | ||
| "action": { | ||
| "indent": "none", | ||
| "appendText": "// " | ||
| } | ||
| }, | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
|
Contributor
There was a problem hiding this comment. I can see the module was already in the enterprise cluster: moving it to |
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -102,6 +102,14 @@ | |
| <specification-version>1.0</specification-version> | ||
| </run-dependency> | ||
| </dependency> | ||
| <dependency> | ||
| <code-name-base>org.netbeans.libs.jackson</code-name-base> | ||
|
Contributor
There was a problem hiding this comment. I can already see:
I assume both the existing libraries could parse the JSON as well. What's your motivation to add Jackson?
Contributor
Author
There was a problem hiding this comment. So, unfortunately, the real-world language configurations (at least the C/C++ one) contain things like comments: or trailing commas in object definitions: Given the goal here is to be able to use the unmodified language configuration files, we need a parser that can tolerate both of these, and I believe Gson cannot be configured to tolerate the trailing commas, and the simple json does not tolerate the comments (although I admit I didn't know about the simple json). Jackson can be configured to tolerate both of these misbehaviors. |
||
| <build-prerequisite/> | ||
| <compile-dependency/> | ||
| <run-dependency> | ||
| <release-version>2</release-version> | ||
| </run-dependency> | ||
| </dependency> | ||
| <dependency> | ||
| <code-name-base>org.netbeans.modules.editor</code-name-base> | ||
| <build-prerequisite/> | ||
|
|
@@ -111,6 +119,15 @@ | |
| <specification-version>1.90</specification-version> | ||
| </run-dependency> | ||
| </dependency> | ||
| <dependency> | ||
| <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base> | ||
| <build-prerequisite/> | ||
| <compile-dependency/> | ||
| <run-dependency> | ||
| <release-version>0</release-version> | ||
| <specification-version>1.72</specification-version> | ||
| </run-dependency> | ||
| </dependency> | ||
| <dependency> | ||
| <code-name-base>org.netbeans.modules.editor.breadcrumbs</code-name-base> | ||
| <build-prerequisite/> | ||
|
|
@@ -445,6 +462,10 @@ | |
| <recursive/> | ||
| <compile-dependency/> | ||
| </test-dependency> | ||
| <test-dependency> | ||
| <code-name-base>org.netbeans.modules.lexer.nbbridge</code-name-base> | ||
| <compile-dependency/> | ||
| </test-dependency> | ||
| <test-dependency> | ||
| <code-name-base>org.netbeans.modules.masterfs</code-name-base> | ||
| <compile-dependency/> | ||
|
|
@@ -474,6 +495,7 @@ | |
| </test-type> | ||
| </test-dependencies> | ||
| <public-packages> | ||
| <package>org.netbeans.modules.lsp.client.api</package> | ||
| <package>org.netbeans.modules.lsp.client.debugger.api</package> | ||
| <package>org.netbeans.modules.lsp.client.debugger.spi</package> | ||
| <package>org.netbeans.modules.lsp.client.spi</package> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.netbeans.modules.lsp.client.api; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Repeatable; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| /**Register a {@code language-configuration.json} for a given mime type. | ||
| * | ||
| * Will also register language features defined in {@link LanguageFeatures} | ||
| * as appropriate. | ||
| * | ||
| * @since 1.38 | ||
| */ | ||
| @Repeatable(LanguageConfigurationRegistrations.class) | ||
| @Target({ElementType.PACKAGE, ElementType.TYPE}) | ||
| public @interface LanguageConfigurationRegistration { | ||
| /** The mime-type under which the grammar should be registered. | ||
| * | ||
| * @return mime-type | ||
| */ | ||
| public String mimeType(); | ||
|
|
||
| /** The language configuration to register. | ||
| * | ||
| * @return language configuration | ||
| */ | ||
| public String languageConfiguration(); | ||
|
Contributor
There was a problem hiding this comment.
|
||
|
|
||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
netbeans/java/kotlin.editor/src/org/netbeans/modules/kotlin/editor/KtDataObject.java
Lines 39 to 48 in e337e53
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@GrammarRegistration?languageConfigurationattribute to@GrammarRegistration?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In theory, the language configuration and grammars are independent (after all, they are two independent files). I admit that in practice, it is hard to image a language configuration for a language with a non-Textmate lexer lexer, so, in practice, these are likely to be used together.
I am, however, not convinced that putting "language configuration" into "GrammarRegistration" is appropriate: the language configuration is not really a grammar, and it is certainly not a place where I would look for the registration of the language configuration.