Skip to content

Commit 7a74e7a

Browse files
committed
fix: broken heredoc
1 parent 4609ed4 commit 7a74e7a

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

src/main/kotlin/com/github/xepozz/caddy/language/parser/Caddy.bnf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ block ::= block_name? LBRACE EOL instructions RBRACE
4848
pin=3
4949
recoverWhile=block_recover
5050
}
51-
private block_recover ::= !(COMMENT | IDENTIFIER | SYMBOL | RBRACE | EOL)
51+
private block_recover ::= !(COMMENT | SYMBOL | RBRACE | EOL)
5252

5353
private instructions ::= (instruction? EOL)*
5454

@@ -89,7 +89,7 @@ heredoc ::= HEREDOC_START HEREDOC_CONTENT* HEREDOC_END
8989
pin=1
9090
implements=["com.intellij.psi.PsiLanguageInjectionHost" "com.intellij.psi.PsiLiteralValue"]
9191
extends="com.github.xepozz.caddy.language.psi.impl.CaddyHeredocContentImpl"
92-
methods=[isValidHost updateText createLiteralTextEscaper]
92+
methods=[]
9393
}
9494

9595
//private instruction_recover ::= !(TEXT | RBRACE)

src/main/kotlin/com/github/xepozz/caddy/language/psi/impl/CaddyPsiImplUtil.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ package com.github.xepozz.caddy.language.psi.impl
33
import com.github.xepozz.caddy.language.psi.CaddyAddress
44
import com.github.xepozz.caddy.language.psi.CaddyHeredoc
55
import com.github.xepozz.caddy.language.psi.CaddyTypes
6-
import com.intellij.psi.LiteralTextEscaper
76
import com.intellij.psi.PsiElement
8-
import com.intellij.psi.PsiLanguageInjectionHost
97
import com.intellij.psi.PsiReference
108
import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry
119

@@ -14,16 +12,6 @@ class CaddyPsiImplUtil {
1412
@JvmStatic
1513
fun getValue(element: CaddyAddress): String? = element.text
1614

17-
@JvmStatic
18-
fun isValidHost(element: CaddyHeredoc): Boolean = element.isValidHost
19-
20-
@JvmStatic
21-
fun updateText(element: CaddyHeredoc, newText: String): PsiLanguageInjectionHost = element.updateText(newText)
22-
23-
@JvmStatic
24-
fun createLiteralTextEscaper(element: CaddyHeredoc): LiteralTextEscaper<out PsiLanguageInjectionHost> =
25-
element.createLiteralTextEscaper()
26-
2715
@JvmStatic
2816
fun getValue(element: CaddyHeredoc): String? =
2917
element.node.findChildByType(CaddyTypes.HEREDOC_CONTENT)?.text?.trimIndent()

0 commit comments

Comments
 (0)