Merge pull request #335 from shiraji/shiraji/escape-comment-space-for…

…-inject-language Escape comment space for "Inject Language"
pinterest · Feb 4, 2019 · bff39f6 · bff39f6
2 parents 850b5de + a9cd60b
commit bff39f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/...-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/CommentSpacingRule.kt b/...-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/CommentSpacingRule.kt
@@ -31,6 +31,7 @@ class CommentSpacingRule : Rule("comment-spacing") {
                 !text.startsWith("//noinspection") &&
                 !text.startsWith("//region") &&
                 !text.startsWith("//endregion") &&
+                !text.startsWith("//language=") &&
                 !allForwardSlashesRegex.matches(text)
             ) {
                 emit(node.startOffset, "Missing space after //", true)

diff --git a/...ndard/src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/CommentSpacingRuleTest.kt b/...ndard/src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/CommentSpacingRuleTest.kt
@@ -14,6 +14,9 @@ class CommentSpacingRuleTest {
             """
                 //
                 //noinspection AndroidLintRecycle
+                //region
+                //endregion
+                //language=SQL
                 // comment
                 var debugging = false // comment
                 var debugging = false // comment//word