Parse const as soft modifier keyword

This commit is contained in:
Denis Zharkov
2015-09-21 15:33:35 +03:00
parent 4a3ac474ca
commit 02b64ce1ed
15 changed files with 64 additions and 3 deletions
+4
View File
@@ -60,6 +60,7 @@ ref
val param
val sparam
val lateinit
val const
get() = a
set(S : s) {}
@@ -94,6 +95,7 @@ ref
fun param () : param
fun sparam () : sparam
fun lateinit () : lateinit
fun const () : const
fun test(
abstract : t,
@@ -125,6 +127,7 @@ ref
param : t,
sparam : t,
lateinit : t,
const : t,
public protected private internal abstract
open
enum
@@ -173,6 +176,7 @@ class F(val foo : bar,
param : t,
sparam : t,
lateinit : t,
const : t,
public protected private internal abstract
open
enum
+43
View File
@@ -317,6 +317,11 @@ JetFile: SoftKeywords.kt
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('lateinit')
PsiWhiteSpace('\n ')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('const')
PsiWhiteSpace('\n ')
PROPERTY_ACCESSOR
PsiElement(get)('get')
@@ -819,6 +824,22 @@ JetFile: SoftKeywords.kt
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('lateinit')
PsiWhiteSpace('\n ')
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('const')
PsiWhiteSpace(' ')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('const')
PsiWhiteSpace('\n\n ')
FUN
PsiElement(fun)('fun')
@@ -1145,6 +1166,17 @@ JetFile: SoftKeywords.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('t')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('const')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('t')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
MODIFIER_LIST
@@ -1531,6 +1563,17 @@ JetFile: SoftKeywords.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('t')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('const')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('t')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
VALUE_PARAMETER
MODIFIER_LIST