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.

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

resolve imported names #208

Merged
merged 14 commits into from
Jan 4, 2024
6 changes: 4 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ jobs:

steps:
- uses: Swatinem/rust-cache@v2
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: setup toolchain
uses: hecrj/setup-rust-action@v1
with:
Expand All @@ -33,4 +35,4 @@ jobs:
- name: rustfmt
run: cargo +nightly fmt --all -- --check
- name: clippy
run: cargo +nightly clippy --all --all-features --tests -- -D warnings
run: cargo +nightly clippy --all --all-features --tests -- -D warnings
2 changes: 1 addition & 1 deletion client/vscode/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export async function activate(_context: ExtensionContext) {
run,
debug: run,
};
let clientOptions: LanguageClientOptions = {
const clientOptions: LanguageClientOptions = {
documentSelector: [{ scheme: "file", language: "python" }],
traceOutputChannel,
};
Expand Down
2 changes: 1 addition & 1 deletion parser/src/lexer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@ def",

f = c

# Path: test_local.py
# Path: test_local.py
",
],
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
source: parser/src/lexer/lexer.rs
description: "if a:\n\n f = c\n\n # Path: test_local.py\t\n"
source: parser/src/lexer/mod.rs
description: "if a:\n\n f = c\n\n # Path: test_local.py\n"
---
[
Token {
Expand Down Expand Up @@ -80,23 +80,23 @@ description: "if a:\n\n f = c\n\n # Path: test_local.py\t\n"
Token {
kind: Comment,
value: Str(
"# Path: test_local.py\t",
"# Path: test_local.py",
),
start: 22,
end: 44,
end: 43,
},
Token {
kind: NewLine,
value: None,
start: 44,
end: 45,
start: 43,
end: 44,
},
Token {
kind: Dedent,
value: Indent(
1,
),
start: 45,
end: 45,
start: 44,
end: 44,
},
]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
source: parser/src/lexer/lexer.rs
description: "def a[T: U, *V, **W](): pass\n"
source: parser/src/lexer/mod.rs
description: "def a[T: U, *V, **W](): pass"
input_file: parser/test_data/inputs/one_liners/function_def.py
---
[
Expand Down Expand Up @@ -116,10 +116,4 @@ input_file: parser/test_data/inputs/one_liners/function_def.py
start: 24,
end: 28,
},
Token {
kind: NewLine,
value: None,
start: 28,
end: 29,
},
]
Loading