v0.1.8 version

Cargo.toml

@@ -3,7 +3,6 @@ resolver = "2"
 members = [
     "jinja-lsp-queries",
     "jinja-lsp",
-    "example"
 ]
 
 [profile.dev]

README.md

@@ -1,7 +1,12 @@
-<img src="https://raw.githubusercontent.com/uros-5/jinja-lsp/main/.github/banner.png" alt="" />
+<img src="https://raw.githubusercontent.com/uros-5/jinja-lsp/main/.github/banner.png" alt="banner" />
 
 jinja-lsp enhances minijinja development experience by providing Helix/Nvim users with advanced features such as autocomplete, syntax highlighting, hover, goto definition, code actions and linting.
 
+<div align="center">
+  <a href="https://crates.io/crates/jinja-lsp"><img alt="crates.io" src="https://img.shields.io/crates/v/jinja-lsp.svg?style=for-the-badge&color=fdbb39&logo=rust" height="20"></a>
+  <a href="https://marketplace.visualstudio.com/items?itemName=urosmrkobrada.jinja-lsp"><img alt="visualstudio.com" src="https://vsmarketplacebadges.dev/version/urosmrkobrada.jinja-lsp.svg?color=007ACC" height="20"></a>
+</div>
+
 ## Installation
 
 ```sh
@@ -80,4 +85,4 @@ name = "jinja"
 language-servers = ["jinja-lsp"]
 ```
 
-[VSCode support](https://marketplace.visualstudio.com/search?term=jinja-lsp&target=VSCode&category=Other&sortBy=Relevance)
+Supported languages: Python, Rust

editors/code/client/package.json

@@ -3,7 +3,7 @@
   "description": "VSCode part of a language server",
   "author": "uros-5",
   "license": "MIT",
-  "version": "0.1.73",
+  "version": "0.1.80",
   "publisher": "uros",
   "repository": {
     "type": "git",

editors/code/client/src/extension.ts

@@ -20,7 +20,7 @@ export function activate(context: ExtensionContext) {
 	// The server is implemented in node
 	const serverModule = getServer();
 	if (!serverModule.valid) {
-		throw new Error(serverModule.name);	
+		throw new Error(serverModule.name);
 	}
 
 	let config: Record<string, any> = JSON.parse(
@@ -30,7 +30,7 @@ export function activate(context: ExtensionContext) {
 	// If the extension is launched in debug mode then the debug server options are used
 	// Otherwise the run options are used
 	const serverOptions: ServerOptions = {
-		run: { command: serverModule.name},
+		run: { command: serverModule.name },
 		debug: {
 			command: serverModule.name,
 			args: [],
@@ -40,11 +40,11 @@ export function activate(context: ExtensionContext) {
 	// Options to control the language client
 	const clientOptions: LanguageClientOptions = {
 		// Register the server for plain text documents
-		documentSelector: [{ scheme: 'file', language: 'jinja-html' }, { scheme: 'file', language: 'rust' }],
+		documentSelector: [{ scheme: 'file', language: 'jinja-html' }, { scheme: 'file', language: 'rust' }, { scheme: 'file', language: 'python' }],
 		initializationOptions: config,
 		synchronize: {
 			// Notify the server about file changes to '.clientrc files contained in the workspace
-			fileEvents: workspace.createFileSystemWatcher('**/.{jinja, rs}')
+			fileEvents: workspace.createFileSystemWatcher('**/.{jinja, rs, python}')
 		}
 	};
 

editors/code/package.json

@@ -2,7 +2,7 @@
   "name": "jinja-lsp",
   "description": "jinja-lsp",
   "license": "MIT",
-  "version": "0.1.73",
+  "version": "0.1.80",
   "repository": {
     "url": "https://github.com/uros-5/jinja-lsp"
   },
@@ -17,14 +17,17 @@
     "multi-root ready",
     "jinja",
     "minijinja",
-    "rust"
+    "rust",
+    "jinja-lsp",
+    "python"
   ],
   "engines": {
     "vscode": "^1.75.0"
   },
   "activationEvents": [
     "onLanguage:jinja-html",
-    "onLanguage:rust"
+    "onLanguage:rust",
+    "onLanguage:python"
   ],
   "main": "./client/out/extension",
   "contributes": {
@@ -47,7 +50,8 @@
         "jinja-lsp.lang": {
           "type": "string",
           "enum": [
-            "rust"
+            "rust",
+            "python"
           ],
           "default": "rust",
           "description": "Language that is used on backend"

jinja-lsp-queries/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jinja-lsp-queries"
-version = "0.1.71"
+version = "0.1.80"
 edition = "2021"
 description = "TreeSitter queries for jinja-lsp"
 license = "MIT"
@@ -11,4 +11,5 @@ tree-sitter-jinja2 = "0.0.6"
 tree-sitter-rust = "0.20.4"
 tower-lsp = { version = "0.20.0", features = ["proposed"] }
 ropey = "1.5.0"
+tree-sitter-python = "=0.20.4"
 

jinja-lsp-queries/src/lsp_helper.rs

@@ -19,7 +19,7 @@ pub fn search_errors(
     file_name: &String,
     templates: &String,
     lang_type: LangType,
-) -> Option<Vec<Diagnostic>> {
+) -> Option<Vec<(JinjaDiagnostic, Identifier)>> {
     let mut diagnostics = vec![];
     match lang_type {
         LangType::Template => {
@@ -70,11 +70,7 @@ pub fn search_errors(
                     }
                 }
                 if to_warn {
-                    let diagnostic = create_diagnostic(
-                        &Identifier::from(&object),
-                        err_type.severity(),
-                        err_type.to_string(),
-                    );
+                    let diagnostic = (err_type, Identifier::from(&object));
                     diagnostics.push(diagnostic);
                 }
             }
@@ -90,15 +86,13 @@ pub fn search_errors(
             for i in id_templates {
                 let err_type = JinjaDiagnostic::TemplateNotFound;
                 if i.name.is_empty() {
-                    let diagnostic =
-                        create_diagnostic(i, err_type.severity(), err_type.to_string());
+                    let diagnostic = (err_type, i.to_owned());
                     diagnostics.push(diagnostic);
                 } else {
                     let path = format!("{templates}/{}", i.name);
                     if let Err(err) = std::fs::canonicalize(path) {
                         if err.kind() == ErrorKind::NotFound {
-                            let diagnostic =
-                                create_diagnostic(i, err_type.severity(), err_type.to_string());
+                            let diagnostic = (err_type, i.to_owned());
                             diagnostics.push(diagnostic);
                         }
                     }
@@ -115,11 +109,7 @@ pub fn search_errors(
                 let path = format!("{templates}/{}", template.name);
                 if let Err(err) = std::fs::canonicalize(path) {
                     if err.kind() == ErrorKind::NotFound {
-                        let diagnostic = create_diagnostic(
-                            template,
-                            DiagnosticSeverity::WARNING,
-                            "Template not found".to_string(),
-                        );
+                        let diagnostic = (JinjaDiagnostic::TemplateNotFound, template.to_owned());
                         diagnostics.push(diagnostic);
                     }
                 }

jinja-lsp-queries/src/parsers.rs

@@ -19,6 +19,13 @@ impl Parsers {
             LangType::Backend => self.backend.parse(text, old_tree),
         }
     }
+
+    pub fn update_backend(&mut self, lang: &str) {
+        if lang == "python" {
+            self.backend = Parser::new();
+            let _ = self.backend.set_language(tree_sitter_python::language());
+        }
+    }
 }
 
 impl Default for Parsers {

jinja-lsp-queries/src/search/mod.rs

@@ -4,11 +4,9 @@ use tree_sitter::Point;
 use self::objects::JinjaObject;
 
 pub mod definition;
-pub mod jinja_state;
 pub mod objects;
 pub mod queries;
 pub mod rust_identifiers;
-pub mod rust_state;
 pub mod rust_template_completion;
 pub mod snippets_completion;
 pub mod templates;

jinja-lsp-queries/src/search/objects.rs

@@ -178,4 +178,6 @@ pub enum CompletionType {
     Snippets { range: Range },
 }
 
-static VALID_IDENTIFIERS: [&str; 6] = ["loop", "true", "false", "not", "as", "module"];
+static VALID_IDENTIFIERS: [&str; 8] = [
+    "loop", "true", "false", "not", "as", "module", "super", "url_for",
+];