diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-29 12:24:19 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-29 12:24:19 +0000 |
commit | cdcb3d3833d3d5b37b2cd4dac91a6e9366f20aea (patch) | |
tree | c9750e1ef8079a691caed3dc941392c99fda1524 /crates/ra_syntax/src/grammar.ron | |
parent | c5a48bea1218afb63d7932a6816f34c810bbab6b (diff) | |
parent | 9fd2c813ca355c3a1f10f54993c16e81778b867b (diff) |
Merge #2667
2667: Visibility r=matklad a=flodiebold
This adds the infrastructure for handling visibility (for fields and methods, not in name resolution) in the HIR and code model, and as a first application hides struct fields from completions if they're not visible from the current module. (We might want to relax this again later, but I think it's ok for now?)
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src/grammar.ron')
-rw-r--r-- | crates/ra_syntax/src/grammar.ron | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index 08aafb610..e43a724f0 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron | |||
@@ -412,7 +412,7 @@ Grammar( | |||
412 | "ModuleItem": ( | 412 | "ModuleItem": ( |
413 | enum: ["StructDef", "UnionDef", "EnumDef", "FnDef", "TraitDef", "TypeAliasDef", "ImplBlock", | 413 | enum: ["StructDef", "UnionDef", "EnumDef", "FnDef", "TraitDef", "TypeAliasDef", "ImplBlock", |
414 | "UseItem", "ExternCrateItem", "ConstDef", "StaticDef", "Module" ], | 414 | "UseItem", "ExternCrateItem", "ConstDef", "StaticDef", "Module" ], |
415 | traits: ["AttrsOwner"], | 415 | traits: ["AttrsOwner", "VisibilityOwner"], |
416 | ), | 416 | ), |
417 | "ImplItem": ( | 417 | "ImplItem": ( |
418 | enum: ["FnDef", "TypeAliasDef", "ConstDef"], | 418 | enum: ["FnDef", "TypeAliasDef", "ConstDef"], |
@@ -683,7 +683,7 @@ Grammar( | |||
683 | ] | 683 | ] |
684 | ), | 684 | ), |
685 | "UseItem": ( | 685 | "UseItem": ( |
686 | traits: ["AttrsOwner"], | 686 | traits: ["AttrsOwner", "VisibilityOwner"], |
687 | options: [ "UseTree" ], | 687 | options: [ "UseTree" ], |
688 | ), | 688 | ), |
689 | "UseTree": ( | 689 | "UseTree": ( |
@@ -696,7 +696,7 @@ Grammar( | |||
696 | collections: [("use_trees", "UseTree")] | 696 | collections: [("use_trees", "UseTree")] |
697 | ), | 697 | ), |
698 | "ExternCrateItem": ( | 698 | "ExternCrateItem": ( |
699 | traits: ["AttrsOwner"], | 699 | traits: ["AttrsOwner", "VisibilityOwner"], |
700 | options: ["NameRef", "Alias"], | 700 | options: ["NameRef", "Alias"], |
701 | ), | 701 | ), |
702 | "ArgList": ( | 702 | "ArgList": ( |