azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"type" is not a keyword anymore ("typealias" reserved instead)

Browse Source
This commit is contained in:
Andrey Breslav
2014-10-11 02:17:50 +04:00
parent b20439027c
commit cc68ed894b
41 changed files with 695 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/_KDocLexer.java
+20 -36
View File
@@ -1,20 +1,4 @@
/*
* Copyright 2010-2014 JetBrains s.r.o.
*
* Licensed 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.
*/
/* The following code was generated by JFlex 1.4.3 on 7/15/14 9:40 PM */
/* The following code was generated by JFlex 1.4.3 on 10/13/14 2:48 PM */
package org.jetbrains.jet.kdoc.lexer;
@@ -28,8 +12,8 @@ import java.lang.Character;
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3
* on 7/15/14 9:40 PM from the specification file
* <tt>C:/Projects/kotlin/compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/KDoc.flex</tt>
* on 10/13/14 2:48 PM from the specification file
* <tt>/Users/abreslav/work/kotlin/compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/KDoc.flex</tt>
*/
class _KDocLexer implements FlexLexer {
/** initial size of the lookahead buffer */
@@ -569,11 +553,6 @@ class _KDocLexer implements FlexLexer {
zzMarkedPos = zzMarkedPosL;
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
case 5:
{ if (isLastToken()) return KDocTokens.END;
else return KDocTokens.TEXT;
}
case 11: break;
case 3:
{ if (yytextContainLineBreaks()) {
yybegin(LINE_BEGINNING);
@@ -583,6 +562,11 @@ class _KDocLexer implements FlexLexer {
return KDocTokens.TEXT; // internal white space
}
}
case 11: break;
case 5:
{ if (isLastToken()) return KDocTokens.END;
else return KDocTokens.TEXT;
}
case 12: break;
case 9:
{ yybegin(CONTENTS);
@@ -594,9 +578,9 @@ class _KDocLexer implements FlexLexer {
return KDocTokens.WIKI_LINK_CLOSE;
}
case 14: break;
case 6:
case 8:
{ yybegin(CONTENTS);
return KDocTokens.MARKDOWN_ESCAPED_CHAR;
return KDocTokens.WIKI_LINK_OPEN;
}
case 15: break;
case 10:
@@ -604,24 +588,24 @@ class _KDocLexer implements FlexLexer {
return KDocTokens.START;
}
case 16: break;
case 1:
{ return TokenType.BAD_CHARACTER;
}
case 17: break;
case 6:
{ yybegin(CONTENTS);
return KDocTokens.MARKDOWN_ESCAPED_CHAR;
}
case 18: break;
case 2:
{ yybegin(CONTENTS);
return KDocTokens.TEXT;
}
case 17: break;
case 1:
{ return TokenType.BAD_CHARACTER;
}
case 18: break;
case 19: break;
case 4:
{ yybegin(CONTENTS_BEGINNING);
return KDocTokens.LEADING_ASTERISK;
}
case 19: break;
case 8:
{ yybegin(CONTENTS);
return KDocTokens.WIKI_LINK_OPEN;
}
case 20: break;
default:
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+5 -5
View File
@@ -51,7 +51,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
private static final TokenSet TYPE_ARGUMENT_LIST_STOPPERS = TokenSet.create(
INTEGER_LITERAL, FLOAT_LITERAL, CHARACTER_LITERAL, OPEN_QUOTE,
PACKAGE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD,
PACKAGE_KEYWORD, AS_KEYWORD, TYPE_ALIAS_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD,
FUN_KEYWORD, FOR_KEYWORD, NULL_KEYWORD,
TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD, THROW_KEYWORD, RETURN_KEYWORD, BREAK_KEYWORD,
CONTINUE_KEYWORD, OBJECT_KEYWORD, IF_KEYWORD, TRY_KEYWORD, ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD,
@@ -121,7 +121,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
VAL_KEYWORD, VAR_KEYWORD,
TRAIT_KEYWORD,
CLASS_KEYWORD,
TYPE_KEYWORD
TYPE_ALIAS_KEYWORD
),
MODIFIER_KEYWORDS
);
@@ -600,7 +600,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
parseDoWhile();
}
else if (atSet(CLASS_KEYWORD, FUN_KEYWORD, VAL_KEYWORD,
VAR_KEYWORD, TYPE_KEYWORD)) {
VAR_KEYWORD, TYPE_ALIAS_KEYWORD)) {
parseLocalDeclaration();
}
else if (at(FIELD_IDENTIFIER)) {
@@ -1295,8 +1295,8 @@ public class JetExpressionParsing extends AbstractJetParsing {
else if (keywordToken == VAL_KEYWORD || keywordToken == VAR_KEYWORD) {
declType = myJetParsing.parseProperty(true);
}
else if (keywordToken == TYPE_KEYWORD) {
declType = myJetParsing.parseTypeDef();
else if (keywordToken == TYPE_ALIAS_KEYWORD) {
declType = myJetParsing.parseTypeAlias();
}
else if (keywordToken == OBJECT_KEYWORD) {
// Object expression may appear at the statement position: should parse it
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+10 -10
View File
@@ -43,9 +43,9 @@ public class JetParsing extends AbstractJetParsing {
}
}
private static final TokenSet TOPLEVEL_OBJECT_FIRST = TokenSet.create(TYPE_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD,
private static final TokenSet TOPLEVEL_OBJECT_FIRST = TokenSet.create(TYPE_ALIAS_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD,
FUN_KEYWORD, VAL_KEYWORD, PACKAGE_KEYWORD);
private static final TokenSet ENUM_MEMBER_FIRST = TokenSet.create(TYPE_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD,
private static final TokenSet ENUM_MEMBER_FIRST = TokenSet.create(TYPE_ALIAS_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD,
FUN_KEYWORD, VAL_KEYWORD, IDENTIFIER);
private static final TokenSet CLASS_NAME_RECOVERY_SET = TokenSet.orSet(TokenSet.create(LT, LPAR, COLON, LBRACE), TOPLEVEL_OBJECT_FIRST);
@@ -367,8 +367,8 @@ public class JetParsing extends AbstractJetParsing {
else if (keywordToken == VAL_KEYWORD || keywordToken == VAR_KEYWORD) {
declType = parseProperty();
}
else if (keywordToken == TYPE_KEYWORD) {
declType = parseTypeDef();
else if (keywordToken == TYPE_ALIAS_KEYWORD) {
declType = parseTypeAlias();
}
else if (keywordToken == OBJECT_KEYWORD) {
parseObject(true, true);
@@ -754,8 +754,8 @@ public class JetParsing extends AbstractJetParsing {
else if (keywordToken == VAL_KEYWORD || keywordToken == VAR_KEYWORD) {
declType = parseProperty();
}
else if (keywordToken == TYPE_KEYWORD) {
declType = parseTypeDef();
else if (keywordToken == TYPE_ALIAS_KEYWORD) {
declType = parseTypeAlias();
}
else if (keywordToken == OBJECT_KEYWORD) {
parseObject(true, true);
@@ -877,13 +877,13 @@ public class JetParsing extends AbstractJetParsing {
/*
* typedef
* : modifiers "type" SimpleName (typeParameters typeConstraints)? "=" type
* : modifiers "typealias" SimpleName (typeParameters typeConstraints)? "=" type
* ;
*/
JetNodeType parseTypeDef() {
assert _at(TYPE_KEYWORD);
JetNodeType parseTypeAlias() {
assert _at(TYPE_ALIAS_KEYWORD);
advance(); // TYPE_KEYWORD
advance(); // TYPE_ALIAS_KEYWORD
expect(IDENTIFIER, "Type name expected", TokenSet.orSet(TokenSet.create(LT, EQ, SEMICOLON), TOPLEVEL_OBJECT_FIRST));
compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex
+1 -1
View File
@@ -242,6 +242,7 @@ LONG_TEMPLATE_ENTRY_START=\$\{
{CHARACTER_LITERAL} { return JetTokens.CHARACTER_LITERAL; }
"typealias" { return JetTokens.TYPE_ALIAS_KEYWORD ;}
"continue" { return JetTokens.CONTINUE_KEYWORD ;}
"package" { return JetTokens.PACKAGE_KEYWORD ;}
"return" { return JetTokens.RETURN_KEYWORD ;}
@@ -255,7 +256,6 @@ LONG_TEMPLATE_ENTRY_START=\$\{
"super" { return JetTokens.SUPER_KEYWORD ;}
"when" { return JetTokens.WHEN_KEYWORD ;}
"true" { return JetTokens.TRUE_KEYWORD ;}
"type" { return JetTokens.TYPE_KEYWORD ;}
"this" { return JetTokens.THIS_KEYWORD ;}
"null" { return JetTokens.NULL_KEYWORD ;}
"else" { return JetTokens.ELSE_KEYWORD ;}
compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java
+6 -6
View File
@@ -46,12 +46,12 @@ public interface JetTokens {
JetToken LONG_TEMPLATE_ENTRY_END = new JetToken("LONG_TEMPLATE_ENTRY_END");
JetToken DANGLING_NEWLINE = new JetToken("DANGLING_NEWLINE");
JetKeywordToken PACKAGE_KEYWORD = JetKeywordToken.keyword("package");
JetKeywordToken PACKAGE_KEYWORD = JetKeywordToken.keyword("package");
JetKeywordToken AS_KEYWORD = JetKeywordToken.keyword("as");
JetKeywordToken TYPE_KEYWORD = JetKeywordToken.keyword("type");
JetKeywordToken TYPE_ALIAS_KEYWORD = JetKeywordToken.keyword("typealias");
JetKeywordToken CLASS_KEYWORD = JetKeywordToken.keyword("class");
JetKeywordToken THIS_KEYWORD = JetKeywordToken.keyword("this");
JetKeywordToken SUPER_KEYWORD = JetKeywordToken.keyword("super");
JetKeywordToken SUPER_KEYWORD = JetKeywordToken.keyword("super");
JetKeywordToken VAL_KEYWORD = JetKeywordToken.keyword("val");
JetKeywordToken VAR_KEYWORD = JetKeywordToken.keyword("var");
JetKeywordToken FUN_KEYWORD = JetKeywordToken.keyword("fun");
@@ -71,8 +71,8 @@ public interface JetTokens {
JetKeywordToken ELSE_KEYWORD = JetKeywordToken.keyword("else");
JetKeywordToken WHILE_KEYWORD = JetKeywordToken.keyword("while");
JetKeywordToken DO_KEYWORD = JetKeywordToken.keyword("do");
JetKeywordToken WHEN_KEYWORD = JetKeywordToken.keyword("when");
JetKeywordToken TRAIT_KEYWORD = JetKeywordToken.keyword("trait");
JetKeywordToken WHEN_KEYWORD = JetKeywordToken.keyword("when");
JetKeywordToken TRAIT_KEYWORD = JetKeywordToken.keyword("trait");
// TODO: Discuss "This" keyword
JetKeywordToken CAPITALIZED_THIS_KEYWORD = JetKeywordToken.keyword("This");
@@ -155,7 +155,7 @@ public interface JetTokens {
JetKeywordToken FINALLY_KEYWORD = JetKeywordToken.softKeyword("finally");
JetModifierKeywordToken FINAL_KEYWORD = JetModifierKeywordToken.softKeywordModifier("final");
TokenSet KEYWORDS = TokenSet.create(PACKAGE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, CLASS_KEYWORD, TRAIT_KEYWORD,
TokenSet KEYWORDS = TokenSet.create(PACKAGE_KEYWORD, AS_KEYWORD, TYPE_ALIAS_KEYWORD, CLASS_KEYWORD, TRAIT_KEYWORD,
THIS_KEYWORD, SUPER_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, FOR_KEYWORD,
NULL_KEYWORD,
TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD,
compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java
+493 -499
View File
File diff suppressed because it is too large Load Diff
compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.kt
+2 -2
View File
@@ -1,5 +1,5 @@
<!UNSUPPORTED!>type Foo = Any<!>
<!UNSUPPORTED!>typealias Foo = Any<!>
fun foo() {
<!UNSUPPORTED!>type Bar = Any<!>
<!UNSUPPORTED!>typealias Bar = Any<!>
}
compiler/testData/psi/EOLsOnRollback.kt
+1 -1
View File
@@ -3,7 +3,7 @@ fun foo() {
fun foo()
class foo
type x = t
typealias x = t
var r
[a] var foo = 4
compiler/testData/psi/EOLsOnRollback.txt
+1 -1
View File
@@ -31,7 +31,7 @@ JetFile: EOLsOnRollback.kt
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace('\n\n ')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ')
compiler/testData/psi/FunctionTypes.kt
+18 -18
View File
@@ -1,24 +1,24 @@
type f = ([a] a) -> b
type f = (a) -> b
type f = () -> [x] b
type f = () -> Unit
typealias f = ([a] a) -> b
typealias f = (a) -> b
typealias f = () -> [x] b
typealias f = () -> Unit
type f = (a : [a] a) -> b
type f = (a : a) -> b
type f = () -> b
type f = () -> Unit
typealias f = (a : [a] a) -> b
typealias f = (a : a) -> b
typealias f = () -> b
typealias f = () -> Unit
type f = (a : [a] a, foo, x : bar) -> b
type f = (foo, a : a) -> b
type f = (foo, a : (a) -> b) -> b
type f = (foo, a : (a) -> b) -> () -> Unit
typealias f = (a : [a] a, foo, x : bar) -> b
typealias f = (foo, a : a) -> b
typealias f = (foo, a : (a) -> b) -> b
typealias f = (foo, a : (a) -> b) -> () -> Unit
//type f = (ref foo, ref a : (ref a) -> b) -> () -> Unit
type f = T.() -> Unit
type f = T.T.() -> Unit
type f = T<A, B>.T<x>.() -> Unit
typealias f = T.() -> Unit
typealias f = T.T.() -> Unit
typealias f = T<A, B>.T<x>.() -> Unit
type f = [a] T.() -> Unit
type f = [a] T.T.() -> Unit
type f = [a] T<A, B>.T<x>.() -> Unit
typealias f = [a] T.() -> Unit
typealias f = [a] T.T.() -> Unit
typealias f = [a] T<A, B>.T<x>.() -> Unit
compiler/testData/psi/FunctionTypes.txt
+18 -18
View File
@@ -2,7 +2,7 @@ JetFile: FunctionTypes.kt
PACKAGE_DIRECTIVE
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -38,7 +38,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -63,7 +63,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -93,7 +93,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -113,7 +113,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -152,7 +152,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -181,7 +181,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -201,7 +201,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -221,7 +221,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -278,7 +278,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -314,7 +314,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -363,7 +363,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('b')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -422,7 +422,7 @@ JetFile: FunctionTypes.kt
PsiComment(EOL_COMMENT)('//type f = (ref foo, ref a : (ref a) -> b) -> () -> Unit')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -448,7 +448,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -478,7 +478,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -531,7 +531,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -567,7 +567,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -607,7 +607,7 @@ JetFile: FunctionTypes.kt
PsiElement(IDENTIFIER)('Unit')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
compiler/testData/psi/FunctionTypes_ERR.kt
+1 -1
View File
@@ -1 +1 @@
type f = (a, ) -> b
typealias f = (a, ) -> b
compiler/testData/psi/FunctionTypes_ERR.txt
+1 -1
View File
@@ -2,7 +2,7 @@ JetFile: FunctionTypes_ERR.kt
PACKAGE_DIRECTIVE
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
compiler/testData/psi/LocalDeclarations.kt
+1 -1
View File
@@ -6,6 +6,6 @@ fun foo() {
out val foo = 5
[a] var foo = 4
type f = T.() -> Unit
typealias f = T.() -> Unit
}
compiler/testData/psi/LocalDeclarations.txt
+1 -1
View File
@@ -97,7 +97,7 @@ JetFile: LocalDeclarations.kt
PsiElement(INTEGER_LITERAL)('4')
PsiWhiteSpace('\n ')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
compiler/testData/psi/SimpleClassMembers.kt
+3 -3
View File
@@ -13,7 +13,7 @@ class foo {
var f
type foo = bar
typealias foo = bar
}
@@ -46,7 +46,7 @@ class foo {
var f
type foo = bar
typealias foo = bar
}
@@ -56,7 +56,7 @@ class foo {
var f
type foo = bar
typealias foo = bar
class object {
compiler/testData/psi/SimpleClassMembers.txt
+3 -3
View File
@@ -56,7 +56,7 @@ JetFile: SimpleClassMembers.kt
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace('\n\n ')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
@@ -240,7 +240,7 @@ JetFile: SimpleClassMembers.kt
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace('\n\n ')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
@@ -272,7 +272,7 @@ JetFile: SimpleClassMembers.kt
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace('\n\n ')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
compiler/testData/psi/SimpleClassMembers_ERR.kt
+1 -1
View File
@@ -12,6 +12,6 @@ class foo {
var f
type foo = ;
typealias foo = ;
}
compiler/testData/psi/SimpleClassMembers_ERR.txt
+1 -1
View File
@@ -60,7 +60,7 @@ JetFile: SimpleClassMembers_ERR.kt
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace('\n\n ')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
compiler/testData/psi/TypeDef.kt
+10 -10
View File
@@ -1,14 +1,14 @@
package foo.bar.goo
type foo = bar
type foo<T> = bar
type foo<T : foo> = bar
type foo<A, B> = bar
type foo<A, B : A> = bar
typealias foo = bar
typealias foo<T> = bar
typealias foo<T : foo> = bar
typealias foo<A, B> = bar
typealias foo<A, B : A> = bar
type foo = bar ;
type foo<T> = bar ;
typealias foo = bar ;
typealias foo<T> = bar ;
type foo<T : foo> = bar ;
type foo<A, B> = bar ;
type foo<A, B : A> = bar ;
typealias foo<T : foo> = bar ;
typealias foo<A, B> = bar ;
typealias foo<A, B : A> = bar ;
compiler/testData/psi/TypeDef.txt
+10 -10
View File
@@ -14,7 +14,7 @@ JetFile: TypeDef.kt
PsiElement(IDENTIFIER)('goo')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
@@ -26,7 +26,7 @@ JetFile: TypeDef.kt
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
@@ -43,7 +43,7 @@ JetFile: TypeDef.kt
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
@@ -67,7 +67,7 @@ JetFile: TypeDef.kt
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
@@ -88,7 +88,7 @@ JetFile: TypeDef.kt
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
@@ -116,7 +116,7 @@ JetFile: TypeDef.kt
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
@@ -130,7 +130,7 @@ JetFile: TypeDef.kt
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
@@ -149,7 +149,7 @@ JetFile: TypeDef.kt
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
@@ -175,7 +175,7 @@ JetFile: TypeDef.kt
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
@@ -198,7 +198,7 @@ JetFile: TypeDef.kt
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
compiler/testData/psi/TypeDef_ERR.kt
+14 -14
View File
@@ -1,17 +1,17 @@
type
type foo
type foo =
type ;
type foo ;
type foo = ;
type = foo
type =
type = foo ;
type = ;
typealias
typealias foo
typealias foo =
typealias ;
typealias foo ;
typealias foo = ;
typealias = foo
typealias =
typealias = foo ;
typealias = ;
type foo<> = bar
type foo<T, > = bar
type foo<A : , B> = bar
typealias foo<> = bar
typealias foo<T, > = bar
typealias foo<A : , B> = bar
class
type foo = bar
typealias foo = bar
compiler/testData/psi/TypeDef_ERR.txt
+14 -14
View File
@@ -2,7 +2,7 @@ JetFile: TypeDef_ERR.kt
PACKAGE_DIRECTIVE
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace('\n')
@@ -10,7 +10,7 @@ JetFile: TypeDef_ERR.kt
PsiErrorElement:Type expected
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiErrorElement:Expecting '='
@@ -20,7 +20,7 @@ JetFile: TypeDef_ERR.kt
PsiErrorElement:Type expected
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
@@ -30,7 +30,7 @@ JetFile: TypeDef_ERR.kt
PsiErrorElement:Type expected
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace(' ')
@@ -40,7 +40,7 @@ JetFile: TypeDef_ERR.kt
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiErrorElement:Expecting '='
@@ -52,7 +52,7 @@ JetFile: TypeDef_ERR.kt
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
@@ -64,7 +64,7 @@ JetFile: TypeDef_ERR.kt
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace(' ')
@@ -76,7 +76,7 @@ JetFile: TypeDef_ERR.kt
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace(' ')
@@ -86,7 +86,7 @@ JetFile: TypeDef_ERR.kt
PsiErrorElement:Type expected
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace(' ')
@@ -100,7 +100,7 @@ JetFile: TypeDef_ERR.kt
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiErrorElement:Type name expected
<empty list>
PsiWhiteSpace(' ')
@@ -112,7 +112,7 @@ JetFile: TypeDef_ERR.kt
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
@@ -129,7 +129,7 @@ JetFile: TypeDef_ERR.kt
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
@@ -150,7 +150,7 @@ JetFile: TypeDef_ERR.kt
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
@@ -182,7 +182,7 @@ JetFile: TypeDef_ERR.kt
<empty list>
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
compiler/testData/psi/annotation/ShortAnnotations.kt
+2 -2
View File
@@ -5,7 +5,7 @@ foo bar(1) buzz<T>(1) zoo object B
foo bar(1) buzz<T>(1) zoo fun a() {}
foo bar(1) buzz<T>(1) zoo val c : Int = 0
foo bar(1) buzz<T>(1) zoo var v : Int = 0
foo bar(1) buzz<T>(1) zoo type T = Int
foo bar(1) buzz<T>(1) zoo typealias T = Int
class Foo {
@@ -15,7 +15,7 @@ class Foo {
foo bar(1) buzz<T>(1) zoo fun a() {}
foo bar(1) buzz<T>(1) zoo val c : Int = 0
foo bar(1) buzz<T>(1) zoo var v : Int = 0
foo bar(1) buzz<T>(1) zoo type T = Int
foo bar(1) buzz<T>(1) zoo typealias T = Int
foo bar(1) buzz<T>(1) zoo {}
}
compiler/testData/psi/annotation/ShortAnnotations.txt
+2 -2
View File
@@ -406,7 +406,7 @@ JetFile: ShortAnnotations.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('zoo')
PsiWhiteSpace(' ')
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace(' ')
@@ -836,7 +836,7 @@ JetFile: ShortAnnotations.kt
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('zoo')
PsiWhiteSpace(' ')
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('T')
PsiWhiteSpace(' ')
compiler/testData/psi/annotation/TypeAnnotations.kt
+1 -1
View File
@@ -1,3 +1,3 @@
class F(a : [a] [b] B)
type f = [b] [x] F<[x] A, B>
typealias f = [b] [x] F<[x] A, B>
compiler/testData/psi/annotation/TypeAnnotations.txt
+1 -1
View File
@@ -39,7 +39,7 @@ JetFile: TypeAnnotations.kt
PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
compiler/testData/psi/examples/FunctionsAndTypes.kt
+10 -10
View File
@@ -1,24 +1,24 @@
type f1 = (T) -> X
typealias f1 = (T) -> X
// type f1 = {(T) => X}
type f2 = (T, E) -> X
typealias f2 = (T, E) -> X
// type f2 = {(T, E) => X}
type f_tuple = (Pair<T, E>) -> X
typealias f_tuple = (Pair<T, E>) -> X
//type f_tuple = {((T, E)) => X}
type hof = (X) -> (T) -> Y
typealias hof = (X) -> (T) -> Y
//type hof = { (X) => {(T) => Y} }
type hof2 = ( (X) -> Y) -> (Y) -> Z
typealias hof2 = ( (X) -> Y) -> (Y) -> Z
//type hof2 = { {(X) => Y} => {(Y) => Z} }
type Comparison<in T> = (a : T, b : T) -> Int
typealias Comparison<in T> = (a : T, b : T) -> Int
//type Comparison<in T> = {(a : T, b : T) => Int}
type Equality<in T> = (a : T, b : T) -> Boolean
typealias Equality<in T> = (a : T, b : T) -> Boolean
//type Equality<in T> = {(a : T, b : T) => Boolean}
type HashFunction<in T> = (obj : T) -> Int
typealias HashFunction<in T> = (obj : T) -> Int
//type HashFunction<in T> = {(obj : T) => Int}
type Runnable = () -> Unit
typealias Runnable = () -> Unit
//type Runnable = {() => ()}
type Function1<in T, out R> = (input : T) -> R
typealias Function1<in T, out R> = (input : T) -> R
//type Function1<in T, out R> = {(input : T) => R}
compiler/testData/psi/examples/FunctionsAndTypes.txt
+10 -10
View File
@@ -2,7 +2,7 @@ JetFile: FunctionsAndTypes.kt
PACKAGE_DIRECTIVE
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f1')
PsiWhiteSpace(' ')
@@ -29,7 +29,7 @@ JetFile: FunctionsAndTypes.kt
PsiComment(EOL_COMMENT)('// type f1 = {(T) => X}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f2')
PsiWhiteSpace(' ')
@@ -63,7 +63,7 @@ JetFile: FunctionsAndTypes.kt
PsiComment(EOL_COMMENT)('// type f2 = {(T, E) => X}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f_tuple')
PsiWhiteSpace(' ')
@@ -105,7 +105,7 @@ JetFile: FunctionsAndTypes.kt
PsiComment(EOL_COMMENT)('//type f_tuple = {((T, E)) => X}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('hof')
PsiWhiteSpace(' ')
@@ -145,7 +145,7 @@ JetFile: FunctionsAndTypes.kt
PsiComment(EOL_COMMENT)('//type hof = { (X) => {(T) => Y} }')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('hof2')
PsiWhiteSpace(' ')
@@ -199,7 +199,7 @@ JetFile: FunctionsAndTypes.kt
PsiComment(EOL_COMMENT)('//type hof2 = { {(X) => Y} => {(Y) => Z} }')
PsiWhiteSpace('\n\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Comparison')
TYPE_PARAMETER_LIST
@@ -249,7 +249,7 @@ JetFile: FunctionsAndTypes.kt
PsiComment(EOL_COMMENT)('//type Comparison<in T> = {(a : T, b : T) => Int}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Equality')
TYPE_PARAMETER_LIST
@@ -299,7 +299,7 @@ JetFile: FunctionsAndTypes.kt
PsiComment(EOL_COMMENT)('//type Equality<in T> = {(a : T, b : T) => Boolean}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('HashFunction')
TYPE_PARAMETER_LIST
@@ -338,7 +338,7 @@ JetFile: FunctionsAndTypes.kt
PsiComment(EOL_COMMENT)('//type HashFunction<in T> = {(obj : T) => Int}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Runnable')
PsiWhiteSpace(' ')
@@ -360,7 +360,7 @@ JetFile: FunctionsAndTypes.kt
PsiComment(EOL_COMMENT)('//type Runnable = {() => ()}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Function1')
TYPE_PARAMETER_LIST
compiler/testData/psi/examples/util/Comparison.kt
+2 -2
View File
@@ -1,4 +1,4 @@
type Comparison<in T> = (T, T) -> Int
typealias Comparison<in T> = (T, T) -> Int
fun naturalOrder<in T : Comparable<T>>(a : T, b : T) : Int = a.compareTo(b)
@@ -8,7 +8,7 @@ enum class ComparisonResult {
LS; EQ; GR
}
type MatchableComparison<in T> = (T, T) -> ComparisonResult
typealias MatchableComparison<in T> = (T, T) -> ComparisonResult
fun asMatchableComparison<T>(cmp : Comparison<T>) : MatchableComparison<T> = {(a, b) ->
val res = cmp(a, b)
compiler/testData/psi/examples/util/Comparison.txt
+2 -2
View File
@@ -2,7 +2,7 @@ JetFile: Comparison.kt
PACKAGE_DIRECTIVE
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Comparison')
TYPE_PARAMETER_LIST
@@ -231,7 +231,7 @@ JetFile: Comparison.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('MatchableComparison')
TYPE_PARAMETER_LIST
compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt
+11 -11
View File
@@ -1,12 +1,12 @@
type f = {T<A, B>.T<x>.() : ()}
type f = {{(S).() : ()}.() : ()}
type f = {{T.() : ()}.() : ()}
type f = {{T.T.() : ()}.() : ()}
type f = {{T<A, B>.T<x>.() : ()}.() : ()}
type f = {{(S).() : ()}.() : ()}
typealias f = {T<A, B>.T<x>.() : ()}
typealias f = {{(S).() : ()}.() : ()}
typealias f = {{T.() : ()}.() : ()}
typealias f = {{T.T.() : ()}.() : ()}
typealias f = {{T<A, B>.T<x>.() : ()}.() : ()}
typealias f = {{(S).() : ()}.() : ()}
type f = [a] {[a] {(S).() : ()}.() : ()}
type f = [a] {[a] {T.() : ()}.() : ()}
type f = [a] {[a] {T.T.() : ()}.() : ()}
type f = [a] {[a] {T<A, B>.T<x>.() : ()}.() : ()}
type f = [a] {[a] {(S).() : ()}.() : ()}
typealias f = [a] {[a] {(S).() : ()}.() : ()}
typealias f = [a] {[a] {T.() : ()}.() : ()}
typealias f = [a] {[a] {T.T.() : ()}.() : ()}
typealias f = [a] {[a] {T<A, B>.T<x>.() : ()}.() : ()}
typealias f = [a] {[a] {(S).() : ()}.() : ()}
compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt
+11 -11
View File
@@ -2,7 +2,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PACKAGE_DIRECTIVE
<empty list>
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -65,7 +65,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -123,7 +123,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -177,7 +177,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -235,7 +235,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -316,7 +316,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -374,7 +374,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -453,7 +453,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -528,7 +528,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -607,7 +607,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
@@ -709,7 +709,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
TYPEDEF
PsiElement(type)('type')
PsiElement(typealias)('typealias')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace(' ')
core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class KeywordStringsGenerated {
public static final Set<String> KEYWORDS = new HashSet<String>(Arrays.asList(
"package",
"as",
"type",
"typealias",
"class",
"this",
"super",
grammar/src/toplevel.grm
+1 -1
View File
@@ -61,5 +61,5 @@ See [Packages](packages.html)
[undocumented]
typedef
: modifiers "type" SimpleName (typeParameters typeConstraints)? "=" type
: modifiers "typealias" SimpleName (typeParameters typeConstraints)? "=" type
;
idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt
+1 -1
View File
@@ -109,7 +109,7 @@ class KeywordCompletion {
add(JetTokens.TRAIT_KEYWORD, inTopLevel, inClassBody, inNonClassBlock)
add(JetTokens.VAL_KEYWORD, inTopLevel, inClassBody, inNonClassBlock)
add(JetTokens.VAR_KEYWORD, inTopLevel, inClassBody, inNonClassBlock)
add(JetTokens.TYPE_KEYWORD, inTopLevel, inClassBody, inNonClassBlock)
add(JetTokens.TYPE_ALIAS_KEYWORD, inTopLevel, inClassBody, inNonClassBlock)
add(JetTokens.IMPORT_KEYWORD, inTopLevel)
add(JetTokens.PACKAGE_KEYWORD, inTopLevel)
idea/testData/completion/keywords/InClassBeforeFun.kt
+1 -1
View File
@@ -49,7 +49,7 @@ public class Test {
// EXIST: trait
// ABSENT: true
// ABSENT: try
// EXIST: type
// EXIST: typealias
// EXIST: val
// EXIST: var
// ABSENT: vararg
idea/testData/completion/keywords/InClassScope.kt
+1 -1
View File
@@ -44,7 +44,7 @@ class TestClass {
// EXIST: trait
// ABSENT: true
// ABSENT: try
// EXIST: type
// EXIST: typealias
// EXIST: val
// EXIST: var
// ABSENT: vararg
idea/testData/completion/keywords/InFunctionScope.kt
+1 -1
View File
@@ -42,7 +42,7 @@ fun foo() {
// EXIST: trait
// EXIST: true
// EXIST: try
// EXIST: type
// EXIST: typealias
// EXIST: val
// EXIST: var
// EXIST: vararg
idea/testData/completion/keywords/InTypeScope.kt
+1 -1
View File
@@ -42,7 +42,7 @@ fun foo() {
// EXIST: trait
// EXIST: true
// EXIST: try
// EXIST: type
// EXIST: typealias
// EXIST: val
// EXIST: var
// EXIST: vararg
idea/testData/completion/keywords/TopScope.kt
+1 -1
View File
@@ -41,7 +41,7 @@
// EXIST: trait
// ABSENT: true
// ABSENT: try
// EXIST: type
// EXIST: typealias
// EXIST: val
// EXIST: var
// ABSENT: vararg