[ release ] Time to draft a release

Author: ice1000

grammar/cov-grammar.bnf

@@ -16,15 +16,15 @@ file ::=
  fileHeader*
  statement*
 
-private endOfLine ::= (EOL comment?)+
+private endOfLine ::= (comment | EOL)+
 number ::= NUM
 break ::= BREAK_KEYWORD
 continue ::= CONTINUE_KEYWORD
 true ::= TRUE_KEYWORD
 false ::= FALSE_KEYWORD
 null ::= NULL_KEYWORD
-comment ::= LINE_COMMENT+ {
-	methods=[updateText getTokenType isValidHost createLiteralTextEscaper]
+comment ::= LINE_COMMENT {
+	methods=[getTokenType isValidHost updateText createLiteralTextEscaper]
 	implements=['com.intellij.psi.PsiLanguageInjectionHost' 'com.intellij.psi.PsiComment']
 }
 
@@ -43,7 +43,6 @@ fileHeader ::=
  | importDeclaration
  | packageDeclaration
  | endOfLine
- | comment
 
 importDeclaration ::= IMPORT_KEYWORD symbol
 usingDeclaration ::= USING_KEYWORD symbol

res/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
 	<id>org.covscript</id>
 	<name>CovScript</name>
-	<version>1.6</version>
+	<version>1.5.1</version>
 	<vendor email="ice1000kotlin@foxmail.com" url="http://covscript.org">ice1000</vendor>
 
 	<description><![CDATA[
@@ -23,10 +23,10 @@ Functions provided:<br/>
 ]]></description>
 
 	<change-notes><![CDATA[
-1.6<br/>
+1.5.1<br/>
 <ul>
   <li>Auto-popup completions</li>
-  <li>Support language injection in comments</li>
+  <li>Parser bug fix</li>
   <li>Detail improvements</li>
 </ul>
 

src/org/covscript/lang/cov-constants.kt

@@ -1,7 +1,7 @@
 package org.covscript.lang
 
 import com.intellij.openapi.util.IconLoader
-import org.jetbrains.annotations.
+import org.jetbrains.annotations.NonNls
 
 @NonNls const val COV_EXTENSION = "csc"
 @NonNls const val COV_EXT_EXTENSION = "cse"

src/org/covscript/lang/psi/impl/cov-psi-impl.kt

@@ -65,13 +65,13 @@ fun collectFrom(startPoint: PsiElement, name: String) = SyntaxTraverser
 
 val CovComment.tokenType: IElementType get() = CovTypes.COMMENT
 val CovComment.isValidHost get() = true
-fun CovComment.updateText(string: String): CovComment = ElementManipulators.handleContentChange(this, string)
+fun CovComment.updateText(string: String): CovComment = replace(CovTokenType.fromText(string, project)) as CovComment
 fun CovComment.createLiteralTextEscaper() = object : LiteralTextEscaper<CovComment>(this@createLiteralTextEscaper) {
 	private var numOfSemicolon = 1
 	override fun isOneLine() = true
 	override fun getOffsetInHost(offsetInDecoded: Int, rangeInHost: TextRange) = offsetInDecoded + numOfSemicolon
 	override fun decode(rangeInHost: TextRange, builder: StringBuilder): Boolean {
-		numOfSemicolon = myHost.text.indexOfFirst { it != '#' }
+		numOfSemicolon = myHost.text.indexOfFirst { it != ';' }
 		builder.append(myHost.text, rangeInHost.startOffset + numOfSemicolon, rangeInHost.endOffset)
 		return true
 	}