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

Warnings #22

Merged
merged 2 commits into from
Jun 21, 2024
Merged

Warnings #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c3d531
added option for disabling warnings
uros-5 Jun 21, 2024
b324436
0.0.10
uros-5 Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI-nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:
'on':
push:
branches:
- completion-fix
- warnings
tags-ignore:
- '**'
paths-ignore:
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/android-arm-eabi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-android-arm-eabi",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"android"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/android-arm64/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-android-arm64",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"android"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/darwin-arm64/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-darwin-arm64",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"darwin"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/darwin-universal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-darwin-universal",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"darwin"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/freebsd-x64/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-freebsd-x64",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"freebsd"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/linux-arm-gnueabihf/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-linux-arm-gnueabihf",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/linux-arm-musleabihf/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-linux-arm-musleabihf",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/linux-arm64-gnu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-linux-arm64-gnu",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/linux-arm64-musl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-linux-arm64-musl",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/linux-riscv64-gnu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-linux-riscv64-gnu",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/linux-x64-gnu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-linux-x64-gnu",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/linux-x64-musl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-linux-x64-musl",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/win32-arm64-msvc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-win32-arm64-msvc",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"win32"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/win32-ia32-msvc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-win32-ia32-msvc",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"win32"
],
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/npm/win32-x64-msvc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions-win32-x64-msvc",
"version": "0.0.9",
"version": "0.0.10",
"os": [
"win32"
],
Expand Down
4 changes: 2 additions & 2 deletions jinja-lsp-nodejs/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jinja-lsp/functions",
"version": "0.0.9",
"version": "0.0.10",
"main": "index.js",
"types": "index.d.ts",
"napi": {
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp-nodejs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ impl NodejsLspFiles {
content,
),
};
self.lsp_files.did_open(params);
self.lsp_files.did_open(params, true);
match ext.as_str() {
"jinja" => {
let objects = self
Expand Down
2 changes: 1 addition & 1 deletion jinja-lsp/src/channels/lsp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ pub fn lsp_task(
}
}
LspMessage::DidOpen(params) => {
if let Some(errors) = lsp_data.did_open(params) {
if let Some(errors) = lsp_data.did_open(params, false) {
let _ = diagnostics_channel.send(errors).await;
}
}
Expand Down
69 changes: 37 additions & 32 deletions jinja-lsp/src/lsp_files.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,37 +633,35 @@ impl LspFiles {
kind: Some(identifier.identifier_type.completion_kind()),
..Default::default() // detail: Some()
};
if &start_item == "" {
if start_item.is_empty() {
items.push(completion_item);
} else if identifier.name.starts_with(&start_item) {
let mut additional_text_edits = None;
let text_edit = if self.is_vscode {
let vec = vec![];
let mut edits = vec;
edits.push(TextEdit {
range: incomplete_range,
new_text: start_item.to_string(),
});
additional_text_edits = Some(edits);
CompletionTextEdit::Edit(TextEdit {
range: Range {
start: incomplete_range.start,
end: incomplete_range.start,
},
new_text: "".to_string(),
})
} else {
CompletionTextEdit::InsertAndReplace(InsertReplaceEdit {
new_text: identifier.name.to_string(),
insert: incomplete_range,
replace: incomplete_range,
})
};
completion_item.text_edit = Some(text_edit);
completion_item.additional_text_edits = additional_text_edits;
items.push(completion_item);
} else {
if identifier.name.starts_with(&start_item) {
let mut additional_text_edits = None;
let text_edit = if self.is_vscode {
let vec = vec![];
let mut edits = vec;
edits.push(TextEdit {
range: incomplete_range,
new_text: start_item.to_string(),
});
additional_text_edits = Some(edits);
CompletionTextEdit::Edit(TextEdit {
range: Range {
start: incomplete_range.start,
end: incomplete_range.start,
},
new_text: "".to_string(),
})
} else {
CompletionTextEdit::InsertAndReplace(InsertReplaceEdit {
new_text: identifier.name.to_string(),
insert: incomplete_range,
replace: incomplete_range,
})
};
completion_item.text_edit = Some(text_edit);
completion_item.additional_text_edits = additional_text_edits;
items.push(completion_item);
}
}

// let starts = starting
Expand Down Expand Up @@ -773,7 +771,11 @@ impl LspFiles {
Some(v)
}

pub fn did_open(&mut self, params: DidOpenTextDocumentParams) -> Option<DiagnosticMessage> {
pub fn did_open(
&mut self,
params: DidOpenTextDocumentParams,
ignore: bool,
) -> Option<DiagnosticMessage> {
let name = params.text_document.uri.as_str();
let lang_type = self.config.file_ext(&Path::new(name))?;
let file_content = params.text_document.text;
Expand All @@ -782,8 +784,11 @@ impl LspFiles {
self.documents.insert(name.to_string(), rope);
self.add_tree(name, lang_type, &file_content);
self.add_variables(name, lang_type, &file_content);
let diagnostics = self.read_tree(name)?;
let mut hm = HashMap::new();
if ignore {
return Some(DiagnosticMessage::Errors(hm));
}
let diagnostics = self.read_tree(name)?;
hm.insert(name.to_owned(), diagnostics);
let msg = DiagnosticMessage::Errors(hm);
Some(msg)
Expand Down
Loading