Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 12:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #45

Browse source 
45: Types r=matklad a=matklad

bors r+
This commit is contained in:
bors[bot] 2018-02-10 09:54:34 +00:00
commit c3b009b6d2
14 changed files with 134 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
grammar.ron
View file

@ -26,6 +26,7 @@ Grammar(
"static",
"mut",
"unsafe",
"type",
],
contextual_keywords: [
"auto",
@ -98,6 +99,7 @@ Grammar(
"CONST_ITEM",
"TRAIT_ITEM",
"IMPL_ITEM",
"TYPE_ITEM",
"EXTERN_BLOCK",
"ENUM_VARIANT",
@ -112,6 +114,7 @@ Grammar(
"ALIAS",
"VISIBILITY",
"TYPE_PARAM_LIST",
"WHERE_CLAUSE",
"LIFETIME_PARAM",
"TYPE_PARAM",
"ABI",

80
src/parser/grammar/items/mod.rs
View file

@ -150,7 +150,14 @@ fn item(p: &mut Parser) {
}
}
}
FN_KW => {
fn_item(p);
FN_ITEM
}
TYPE_KW => {
type_item(p);
TYPE_ITEM
}
MOD_KW => {
mod_item(p);
MOD_ITEM
@ -163,10 +170,6 @@ fn item(p: &mut Parser) {
structs::enum_item(p);
ENUM_ITEM
}
FN_KW => {
fn_item(p);
FN_ITEM
}
L_CURLY => {
item.abandon(p);
error_block(p, "expected item");
@ -203,29 +206,6 @@ fn extern_block(p: &mut Parser) {
p.expect(R_CURLY);
}
fn mod_item(p: &mut Parser) {
assert!(p.at(MOD_KW));
p.bump();
if p.expect(IDENT) && !p.eat(SEMI) {
if p.expect(L_CURLY) {
mod_contents(p, true);
p.expect(R_CURLY);
}
}
}
fn abi(p: &mut Parser) {
assert!(p.at(EXTERN_KW));
let abi = p.start();
p.bump();
match p.current() {
STRING | RAW_STRING => p.bump(),
_ => (),
}
abi.complete(p, ABI);
}
fn fn_item(p: &mut Parser) {
assert!(p.at(FN_KW));
p.bump();
@ -248,3 +228,47 @@ fn fn_item(p: &mut Parser) {
p.expect(R_PAREN);
}
}
// test type_item
// type Foo = Bar;
fn type_item(p: &mut Parser) {
assert!(p.at(TYPE_KW));
p.bump();
p.expect(IDENT);
// test type_item_type_params
// type Result<T> = ();
type_params::list(p);
// test type_item_where_clause
// type Foo where Foo: Copy = ();
type_params::where_clause(p);
p.expect(EQ);
types::type_ref(p);
p.expect(SEMI);
}
fn mod_item(p: &mut Parser) {
assert!(p.at(MOD_KW));
p.bump();
if p.expect(IDENT) && !p.eat(SEMI) {
if p.expect(L_CURLY) {
mod_contents(p, true);
p.expect(R_CURLY);
}
}
}
fn abi(p: &mut Parser) {
assert!(p.at(EXTERN_KW));
let abi = p.start();
p.bump();
match p.current() {
STRING | RAW_STRING => p.bump(),
_ => (),
}
abi.complete(p, ABI);
}

5
src/parser/grammar/type_params.rs
View file

@ -70,6 +70,11 @@ pub(super) fn list(p: &mut Parser) {
pub(super) fn where_clause(p: &mut Parser) {
if p.at(WHERE_KW) {
let m = p.start();
p.bump();
p.expect(IDENT);
p.expect(COLON);
p.expect(IDENT);
m.complete(p, WHERE_CLAUSE);
}
}

11
src/parser/grammar/types.rs
View file

@ -1,5 +1,14 @@
use super::*;
pub(super) fn type_ref(p: &mut Parser) {
p.expect(IDENT);
match p.current() {
IDENT => p.bump(),
L_PAREN => {
p.bump();
p.expect(R_PAREN);
}
_ => {
p.error("expected type");
}
}
}

7
src/syntax_kinds.rs
View file

@ -83,6 +83,7 @@ pub enum SyntaxKind {
STATIC_KW,
MUT_KW,
UNSAFE_KW,
TYPE_KW,
AUTO_KW,
DEFAULT_KW,
UNION_KW,
@ -97,6 +98,7 @@ pub enum SyntaxKind {
CONST_ITEM,
TRAIT_ITEM,
IMPL_ITEM,
TYPE_ITEM,
EXTERN_BLOCK,
ENUM_VARIANT,
NAMED_FIELD,
@ -110,6 +112,7 @@ pub enum SyntaxKind {
ALIAS,
VISIBILITY,
TYPE_PARAM_LIST,
WHERE_CLAUSE,
LIFETIME_PARAM,
TYPE_PARAM,
ABI,
@ -203,6 +206,7 @@ impl SyntaxKind {
STATIC_KW => &SyntaxInfo { name: "STATIC_KW" },
MUT_KW => &SyntaxInfo { name: "MUT_KW" },
UNSAFE_KW => &SyntaxInfo { name: "UNSAFE_KW" },
TYPE_KW => &SyntaxInfo { name: "TYPE_KW" },
AUTO_KW => &SyntaxInfo { name: "AUTO_KW" },
DEFAULT_KW => &SyntaxInfo { name: "DEFAULT_KW" },
UNION_KW => &SyntaxInfo { name: "UNION_KW" },
@ -217,6 +221,7 @@ impl SyntaxKind {
CONST_ITEM => &SyntaxInfo { name: "CONST_ITEM" },
TRAIT_ITEM => &SyntaxInfo { name: "TRAIT_ITEM" },
IMPL_ITEM => &SyntaxInfo { name: "IMPL_ITEM" },
TYPE_ITEM => &SyntaxInfo { name: "TYPE_ITEM" },
EXTERN_BLOCK => &SyntaxInfo { name: "EXTERN_BLOCK" },
ENUM_VARIANT => &SyntaxInfo { name: "ENUM_VARIANT" },
NAMED_FIELD => &SyntaxInfo { name: "NAMED_FIELD" },
@ -230,6 +235,7 @@ impl SyntaxKind {
ALIAS => &SyntaxInfo { name: "ALIAS" },
VISIBILITY => &SyntaxInfo { name: "VISIBILITY" },
TYPE_PARAM_LIST => &SyntaxInfo { name: "TYPE_PARAM_LIST" },
WHERE_CLAUSE => &SyntaxInfo { name: "WHERE_CLAUSE" },
LIFETIME_PARAM => &SyntaxInfo { name: "LIFETIME_PARAM" },
TYPE_PARAM => &SyntaxInfo { name: "TYPE_PARAM" },
ABI => &SyntaxInfo { name: "ABI" },
@ -268,6 +274,7 @@ pub(crate) fn ident_to_keyword(ident: &str) -> Option<SyntaxKind> {
"static" => Some(STATIC_KW),
"mut" => Some(MUT_KW),
"unsafe" => Some(UNSAFE_KW),
"type" => Some(TYPE_KW),
_ => None,
}
}

2
tests/data/lexer/0011_keywords.rs
View file

@ -1,3 +1,3 @@
fn use struct trait enum impl true false as extern crate
mod pub self super in where for loop while if match const
static mut
static mut type

2
tests/data/lexer/0011_keywords.txt
View file

@ -47,4 +47,6 @@ WHITESPACE 1 "\n"
STATIC_KW 6 "static"
WHITESPACE 1 " "
MUT_KW 3 "mut"
WHITESPACE 1 " "
TYPE_KW 4 "type"
WHITESPACE 1 "\n"

1
tests/data/parser/inline/0014_type_item_type_params.rs Normal file
View file

@ -0,0 +1 @@
type Result<T> = ();

17
tests/data/parser/inline/0014_type_item_type_params.txt Normal file
View file

@ -0,0 +1,17 @@
FILE@[0; 21)
TYPE_ITEM@[0; 21)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
IDENT@[5; 11) "Result"
TYPE_PARAM_LIST@[11; 15)
L_ANGLE@[11; 12)
TYPE_PARAM@[12; 13)
IDENT@[12; 13) "T"
R_ANGLE@[13; 14)
WHITESPACE@[14; 15)
EQ@[15; 16)
WHITESPACE@[16; 17)
L_PAREN@[17; 18)
R_PAREN@[18; 19)
SEMI@[19; 20)
WHITESPACE@[20; 21)

1
tests/data/parser/inline/0015_type_item.rs Normal file
View file

@ -0,0 +1 @@
type Foo = Bar;

11
tests/data/parser/inline/0015_type_item.txt Normal file
View file

@ -0,0 +1,11 @@
FILE@[0; 16)
TYPE_ITEM@[0; 16)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
IDENT@[5; 8) "Foo"
WHITESPACE@[8; 9)
EQ@[9; 10)
WHITESPACE@[10; 11)
IDENT@[11; 14) "Bar"
SEMI@[14; 15)
WHITESPACE@[15; 16)

1
tests/data/parser/inline/0016_type_item_where_clause.rs Normal file
View file

@ -0,0 +1 @@
type Foo where Foo: Copy = ();

20
tests/data/parser/inline/0016_type_item_where_clause.txt Normal file
View file

@ -0,0 +1,20 @@
FILE@[0; 31)
TYPE_ITEM@[0; 31)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
IDENT@[5; 8) "Foo"
WHERE_CLAUSE@[8; 25)
WHITESPACE@[8; 9)
WHERE_KW@[9; 14)
WHITESPACE@[14; 15)
IDENT@[15; 18) "Foo"
COLON@[18; 19)
WHITESPACE@[19; 20)
IDENT@[20; 24) "Copy"
WHITESPACE@[24; 25)
EQ@[25; 26)
WHITESPACE@[26; 27)
L_PAREN@[27; 28)
R_PAREN@[28; 29)
SEMI@[29; 30)
WHITESPACE@[30; 31)

7
tests/testutils/src/lib.rs
View file

@ -76,15 +76,14 @@ fn test_from_dir(dir: &Path) -> Vec<PathBuf> {
fn print_difference(expected: &str, actual: &str, path: &Path) {
let dir = project_dir();
let path = path.strip_prefix(&dir).unwrap_or_else(|_| path);
println!("\nfile: {}", path.display());
if expected.trim() == actual.trim() {
println!("whitespace difference");
println!("rewriting the file");
println!("whitespace difference, rewriting");
file::put_text(path, actual).unwrap();
} else {
let changeset = Changeset::new(actual, expected, "\n");
println!("{}", changeset);
print!("{}", changeset);
}
println!("file: {}\n", path.display());
panic!("Comparison failed")
}