Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GRAM: pin the fn keyword in FnPointer #7664

Merged
merged 1 commit into from Aug 12, 2021
Merged

GRAM: pin the fn keyword in FnPointer #7664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/grammars/RustParser.bnf
View file
Open in desktop
Expand Up @@ -936,7 +936,8 @@ RefLikeType ::= RefLikeStart TypeReference {
elementTypeFactory = "org.rust.lang.core.stubs.StubImplementationsKt.factory"
}

FnPointerType ::= [ unsafe? ExternAbi? ] fn FnTypeParameters RetType? {
FnPointerType ::= [ unsafe? ExternAbi? ] fn !identifier FnTypeParameters RetType? {
pin = 3
elementTypeFactory = "org.rust.lang.core.stubs.StubImplementationsKt.factory"
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/rust/ide/docs/RsDocumentationProvider.kt
View file
Open in desktop
Expand Up @@ -541,7 +541,7 @@ private fun generateTypeReferenceDocumentation(element: RsTypeReference, buffer:
is RsFnPointerType -> {
// TODO: handle abi
buffer += "fn"
typeElement.valueParameterList.generateDocumentation(buffer)
typeElement.valueParameterList?.generateDocumentation(buffer)
typeElement.retType?.generateDocumentation(buffer)
}
else -> buffer += element.text.escaped
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/rust/lang/core/parser/RustParserDefinition.kt
View file
Open in desktop
Expand Up @@ -104,6 +104,6 @@ class RustParserDefinition : ParserDefinition {
/**
* Should be increased after any change of parser rules
*/
const val PARSER_VERSION: Int = LEXER_VERSION + 27
const val PARSER_VERSION: Int = LEXER_VERSION + 28
}
}
2 changes: 1 addition & 1 deletion src/main/kotlin/org/rust/lang/core/psi/ext/RsFnPointerType.kt
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ import org.rust.lang.core.psi.RsValueParameter
import org.rust.lang.core.stubs.RsFnPointerTypeStub

val RsFnPointerType.valueParameters: List<RsValueParameter>
get() = valueParameterList.valueParameterList
get() = valueParameterList?.valueParameterList.orEmpty()

val RsFnPointerType.isUnsafe: Boolean
get() {
Expand Down
1 change: 1 addition & 0 deletions src/test/kotlin/org/rust/lang/core/parser/RsPartialParsingTestCase.kt
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ class RsPartialParsingTestCase : RsParsingTestCaseBase("partial") {

fun `test items`() = doTest(true)
fun `test fn`() = doTest(true)
fun `test fn_type`() = doTest(true)
fun `test use item`() = doTest(true)
fun `test shifts`() = doTest(true)
fun `test patterns`() = doTest(true)
Expand Down
3 changes: 3 additions & 0 deletions src/test/resources/org/rust/lang/core/parser/fixtures/partial/fn.rs
View file
Open in desktop
Expand Up @@ -26,3 +26,6 @@ fn bar(a: i32, {}
fn bar(, {}

fn foo(...,,) {}

fn foo() ->
fn bar() {}
25 changes: 25 additions & 0 deletions src/test/resources/org/rust/lang/core/parser/fixtures/partial/fn.txt
View file
Open in desktop
Expand Up @@ -412,3 +412,28 @@ FILE
RsBlockImpl(BLOCK)
PsiElement({)('{')
PsiElement(})('}')
PsiWhiteSpace('\n\n')
RsFunctionImpl(FUNCTION)
PsiElement(fn)('fn')
PsiWhiteSpace(' ')
PsiElement(identifier)('foo')
RsValueParameterListImpl(VALUE_PARAMETER_LIST)
PsiElement(()('(')
PsiElement())(')')
PsiWhiteSpace(' ')
RsRetTypeImpl(RET_TYPE)
PsiElement(->)('->')
PsiErrorElement:'(', ';', <base type>, <macro call>, <ref like type no implicit trait>, '[', extern, fn, for, impl, unsafe or where expected, got 'fn'
<empty list>
PsiWhiteSpace('\n')
RsFunctionImpl(FUNCTION)
PsiElement(fn)('fn')
PsiWhiteSpace(' ')
PsiElement(identifier)('bar')
RsValueParameterListImpl(VALUE_PARAMETER_LIST)
PsiElement(()('(')
PsiElement())(')')
PsiWhiteSpace(' ')
RsBlockImpl(BLOCK)
PsiElement({)('{')
PsiElement(})('}')
7 changes: 7 additions & 0 deletions src/test/resources/org/rust/lang/core/parser/fixtures/partial/fn_type.rs
View file
Open in desktop
@@ -0,0 +1,7 @@
type T = Box<fn>;
fn f(_: fn) {
let x: fn;
let x: fn(;
let _ = |f: fn| ();
let _ = |f: fn(| ();
}
129 changes: 129 additions & 0 deletions src/test/resources/org/rust/lang/core/parser/fixtures/partial/fn_type.txt
View file
Open in desktop
@@ -0,0 +1,129 @@
FILE
RsTypeAliasImpl(TYPE_ALIAS)
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(identifier)('T')
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiWhiteSpace(' ')
RsBaseTypeImpl(BASE_TYPE)
RsPathImpl(PATH)
PsiElement(identifier)('Box')
RsTypeArgumentListImpl(TYPE_ARGUMENT_LIST)
PsiElement(<)('<')
RsFnPointerTypeImpl(FN_POINTER_TYPE)
PsiElement(fn)('fn')
PsiErrorElement:'(' expected, got '>'
<empty list>
PsiElement(>)('>')
PsiElement(;)(';')
PsiWhiteSpace('\n')
RsFunctionImpl(FUNCTION)
PsiElement(fn)('fn')
PsiWhiteSpace(' ')
PsiElement(identifier)('f')
RsValueParameterListImpl(VALUE_PARAMETER_LIST)
PsiElement(()('(')
RsValueParameterImpl(VALUE_PARAMETER)
RsPatWildImpl(PAT_WILD)
PsiElement(_)('_')
PsiElement(:)(':')
PsiWhiteSpace(' ')
RsFnPointerTypeImpl(FN_POINTER_TYPE)
PsiElement(fn)('fn')
PsiErrorElement:'(' expected, got ')'
<empty list>
PsiElement())(')')
PsiWhiteSpace(' ')
RsBlockImpl(BLOCK)
PsiElement({)('{')
PsiWhiteSpace('\n ')
RsLetDeclImpl(LET_DECL)
PsiElement(let)('let')
PsiWhiteSpace(' ')
RsPatIdentImpl(PAT_IDENT)
RsPatBindingImpl(PAT_BINDING)
PsiElement(identifier)('x')
PsiElement(:)(':')
PsiWhiteSpace(' ')
RsFnPointerTypeImpl(FN_POINTER_TYPE)
PsiElement(fn)('fn')
PsiErrorElement:'(' expected, got ';'
<empty list>
PsiElement(;)(';')
PsiWhiteSpace('\n ')
RsLetDeclImpl(LET_DECL)
PsiElement(let)('let')
PsiWhiteSpace(' ')
RsPatIdentImpl(PAT_IDENT)
RsPatBindingImpl(PAT_BINDING)
PsiElement(identifier)('x')
PsiElement(:)(':')
PsiWhiteSpace(' ')
RsFnPointerTypeImpl(FN_POINTER_TYPE)
PsiElement(fn)('fn')
RsValueParameterListImpl(VALUE_PARAMETER_LIST)
PsiElement(()('(')
PsiErrorElement:')' or <anon parameter> expected, got ';'
<empty list>
PsiElement(;)(';')
PsiWhiteSpace('\n ')
RsLetDeclImpl(LET_DECL)
PsiElement(let)('let')
PsiWhiteSpace(' ')
RsPatWildImpl(PAT_WILD)
PsiElement(_)('_')
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiWhiteSpace(' ')
RsLambdaExprImpl(LAMBDA_EXPR)
RsValueParameterListImpl(VALUE_PARAMETER_LIST)
PsiElement(|)('|')
RsValueParameterImpl(VALUE_PARAMETER)
RsPatIdentImpl(PAT_IDENT)
RsPatBindingImpl(PAT_BINDING)
PsiElement(identifier)('f')
PsiElement(:)(':')
PsiWhiteSpace(' ')
RsFnPointerTypeImpl(FN_POINTER_TYPE)
PsiElement(fn)('fn')
PsiErrorElement:'(' expected, got '|'
<empty list>
PsiElement(|)('|')
PsiWhiteSpace(' ')
RsUnitExprImpl(UNIT_EXPR)
PsiElement(()('(')
PsiElement())(')')
PsiElement(;)(';')
PsiWhiteSpace('\n ')
RsLetDeclImpl(LET_DECL)
PsiElement(let)('let')
PsiWhiteSpace(' ')
RsPatWildImpl(PAT_WILD)
PsiElement(_)('_')
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiWhiteSpace(' ')
RsLambdaExprImpl(LAMBDA_EXPR)
RsValueParameterListImpl(VALUE_PARAMETER_LIST)
PsiElement(|)('|')
RsValueParameterImpl(VALUE_PARAMETER)
RsPatIdentImpl(PAT_IDENT)
RsPatBindingImpl(PAT_BINDING)
PsiElement(identifier)('f')
PsiElement(:)(':')
PsiWhiteSpace(' ')
RsFnPointerTypeImpl(FN_POINTER_TYPE)
PsiElement(fn)('fn')
RsValueParameterListImpl(VALUE_PARAMETER_LIST)
PsiElement(()('(')
PsiErrorElement:')' or <anon parameter> expected, got '|'
<empty list>
PsiElement(|)('|')
PsiWhiteSpace(' ')
RsUnitExprImpl(UNIT_EXPR)
PsiElement(()('(')
PsiElement())(')')
PsiElement(;)(';')
PsiWhiteSpace('\n')
PsiElement(})('}')
8 changes: 6 additions & 2 deletions src/test/resources/org/rust/lang/core/parser/fixtures/partial/types.rs
View file
Open in desktop
Expand Up @@ -11,5 +11,9 @@ fn bar() {
type T1 = [
type T2 = &;
type T3 = *;
type T4 = fn(;
type T5 = for<;
type T4 = for<;
type T5 = fn;
type T6 = fn(;
type T7 = unsafe fn;
type T8 = extern "C" fn;
type T9 = extern "C" ;
76 changes: 69 additions & 7 deletions src/test/resources/org/rust/lang/core/parser/fixtures/partial/types.txt
View file
Open in desktop
Expand Up @@ -143,6 +143,34 @@ FILE
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiWhiteSpace(' ')
RsForInTypeImpl(FOR_IN_TYPE)
RsForLifetimesImpl(FOR_LIFETIMES)
PsiElement(for)('for')
PsiElement(<)('<')
PsiErrorElement:<bound>, <lifetime parameter> or '>' expected, got ';'
<empty list>
PsiElement(;)(';')
PsiWhiteSpace('\n')
RsTypeAliasImpl(TYPE_ALIAS)
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(identifier)('T5')
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiWhiteSpace(' ')
RsFnPointerTypeImpl(FN_POINTER_TYPE)
PsiElement(fn)('fn')
PsiErrorElement:'(' expected, got ';'
<empty list>
PsiElement(;)(';')
PsiWhiteSpace('\n')
RsTypeAliasImpl(TYPE_ALIAS)
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(identifier)('T6')
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiWhiteSpace(' ')
RsFnPointerTypeImpl(FN_POINTER_TYPE)
PsiElement(fn)('fn')
RsValueParameterListImpl(VALUE_PARAMETER_LIST)
Expand All @@ -154,14 +182,48 @@ FILE
RsTypeAliasImpl(TYPE_ALIAS)
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(identifier)('T5')
PsiElement(identifier)('T7')
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiWhiteSpace(' ')
RsForInTypeImpl(FOR_IN_TYPE)
RsForLifetimesImpl(FOR_LIFETIMES)
PsiElement(for)('for')
PsiElement(<)('<')
PsiErrorElement:<bound>, <lifetime parameter> or '>' expected, got ';'
<empty list>
RsFnPointerTypeImpl(FN_POINTER_TYPE)
PsiElement(unsafe)('unsafe')
PsiWhiteSpace(' ')
PsiElement(fn)('fn')
PsiErrorElement:'(' expected, got ';'
<empty list>
PsiElement(;)(';')
PsiWhiteSpace('\n')
RsTypeAliasImpl(TYPE_ALIAS)
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(identifier)('T8')
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiWhiteSpace(' ')
RsFnPointerTypeImpl(FN_POINTER_TYPE)
RsExternAbiImpl(EXTERN_ABI)
PsiElement(extern)('extern')
PsiWhiteSpace(' ')
PsiElement(STRING_LITERAL)('"C"')
PsiWhiteSpace(' ')
PsiElement(fn)('fn')
PsiErrorElement:'(' expected, got ';'
<empty list>
PsiElement(;)(';')
PsiWhiteSpace('\n')
RsTypeAliasImpl(TYPE_ALIAS)
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(identifier)('T9')
PsiWhiteSpace(' ')
PsiElement(=)('=')
PsiErrorElement:'(', <macro call>, <path start>, <polybound>, <ref like type>, <trivial base type>, '[', extern, for, impl or unsafe expected, got 'extern'
<empty list>
PsiWhiteSpace(' ')
PsiElement(extern)('extern')
PsiWhiteSpace(' ')
PsiElement(STRING_LITERAL)('"C"')
PsiWhiteSpace(' ')
PsiErrorElement:fn or '{' expected, got ';'
PsiElement(;)(';')