Skip to content

Commit 6bd8a56

Browse files
committed
Fix completion at if not self.
1 parent ea2f208 commit 6bd8a56

File tree

2 files changed

+6
-7
lines changed
  • crates
    • emmylua_ls/src/handlers/emmy_gutter
    • emmylua_parser/src/grammar/lua

2 files changed

+6
-7
lines changed

crates/emmylua_ls/src/handlers/emmy_gutter/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::{
88
};
99
pub use emmy_gutter_request::*;
1010
use emmylua_code_analysis::SemanticModel;
11-
use emmylua_parser::{LuaAstNode, LuaDocTag};
11+
use emmylua_parser::{LuaAstNode, LuaAstToken, LuaDocTag};
1212
use lsp_types::Uri;
1313
use tokio_util::sync::CancellationToken;
1414

@@ -32,7 +32,7 @@ fn build_gutter_infos(semantic_model: &SemanticModel) -> Option<Vec<GutterInfo>>
3232
for tag in root.descendants::<LuaDocTag>() {
3333
match tag {
3434
LuaDocTag::Alias(alias) => {
35-
let range = alias.get_range();
35+
let range = alias.get_name_token()?.get_range();
3636
let lsp_range = document.to_lsp_range(range)?;
3737
gutters.push(GutterInfo {
3838
range: lsp_range,
@@ -41,7 +41,7 @@ fn build_gutter_infos(semantic_model: &SemanticModel) -> Option<Vec<GutterInfo>>
4141
});
4242
}
4343
LuaDocTag::Class(class) => {
44-
let range = class.get_range();
44+
let range = class.get_name_token()?.get_range();
4545
let lsp_range = document.to_lsp_range(range)?;
4646
gutters.push(GutterInfo {
4747
range: lsp_range,
@@ -50,7 +50,7 @@ fn build_gutter_infos(semantic_model: &SemanticModel) -> Option<Vec<GutterInfo>>
5050
});
5151
}
5252
LuaDocTag::Enum(enm) => {
53-
let range = enm.get_range();
53+
let range = enm.get_name_token()?.get_range();
5454
let lsp_range = document.to_lsp_range(range)?;
5555
gutters.push(GutterInfo {
5656
range: lsp_range,

crates/emmylua_parser/src/grammar/lua/expr.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,16 @@ fn parse_sub_expr(p: &mut LuaParser, limit: i32) -> ParseResult {
2121
p.bump();
2222
match parse_sub_expr(p, UNARY_PRIORITY) {
2323
Ok(_) => {}
24-
Err(err) => {
24+
Err(_) => {
2525
p.push_error(LuaParseError::syntax_error_from(
2626
&t!(
2727
"unary operator '%{op}' is not followed by an expression",
2828
op = op_token
2929
),
3030
op_range,
3131
));
32-
return Err(err);
3332
}
34-
}
33+
};
3534
m.complete(p)
3635
} else {
3736
parse_simple_expr(p)?

0 commit comments

Comments
 (0)