jaclang 0.7.33__py3-none-any.whl → 0.8.0__py3-none-any.whl

jaclang/langserve/sem_manager.py

@@ -4,32 +4,30 @@ from __future__ import annotations
 
 from typing import List, Optional, Tuple
 
-import jaclang.compiler.absyntree as ast
-from jaclang.langserve.utils import (
-    find_surrounding_tokens,
-    get_line_of_code,
-    get_token_start,
-)
+import jaclang.compiler.unitree as uni
+from jaclang import JacMachineInterface as Jac
 
 import lsprotocol.types as lspt
 
+(utils,) = Jac.py_jac_import(".utils", base_path=__file__)
+
 
 class SemTokManager:
     """Semantic Token Manager class."""
 
-    def __init__(self, ir: ast.Module) -> None:
+    def __init__(self, ir: uni.Module) -> None:
         """Initialize semantic token manager."""
         self.sem_tokens: List[int] = self.gen_sem_tokens(ir)
         self.static_sem_tokens: List[
-            Tuple[lspt.Position, int, int, ast.AstSymbolNode]
+            Tuple[lspt.Position, int, int, uni.AstSymbolNode]
         ] = self.gen_sem_tok_node(ir)
 
-    def gen_sem_tokens(self, ir: ast.Module) -> list[int]:
+    def gen_sem_tokens(self, ir: uni.Module) -> list[int]:
         """Return semantic tokens."""
         tokens = []
         prev_line, prev_col = 0, 0
         for node in ir._in_mod_nodes:
-            if isinstance(node, ast.NameAtom) and node.sem_token:
+            if isinstance(node, uni.NameAtom) and node.sem_token:
                 line, col_start, col_end = (
                     node.loc.first_line - 1,
                     node.loc.col_start - 1,
@@ -46,12 +44,12 @@ class SemTokManager:
         return tokens
 
     def gen_sem_tok_node(
-        self, ir: ast.Module
-    ) -> List[Tuple[lspt.Position, int, int, ast.AstSymbolNode]]:
+        self, ir: uni.Module
+    ) -> List[Tuple[lspt.Position, int, int, uni.AstSymbolNode]]:
         """Return semantic tokens."""
-        tokens: List[Tuple[lspt.Position, int, int, ast.AstSymbolNode]] = []
+        tokens: List[Tuple[lspt.Position, int, int, uni.AstSymbolNode]] = []
         for node in ir._in_mod_nodes:
-            if isinstance(node, ast.NameAtom) and node.sem_token:
+            if isinstance(node, uni.NameAtom) and node.sem_token:
                 line, col_start, col_end = (
                     node.loc.first_line - 1,
                     node.loc.col_start - 1,
@@ -81,7 +79,7 @@ class SemTokManager:
 
             is_delete = change.text == ""
             prev_token_index, next_token_index, insert_inside_token = (
-                find_surrounding_tokens(
+                utils.find_surrounding_tokens(
                     change_start_line,
                     change_start_char,
                     change_end_line,
@@ -89,9 +87,11 @@ class SemTokManager:
                     sem_tokens,
                 )
             )
-            prev_tok_pos = get_token_start(prev_token_index, sem_tokens)
-            nxt_tok_pos = get_token_start(next_token_index, sem_tokens)
-            changing_line_text = get_line_of_code(change_start_line, document_lines)
+            prev_tok_pos = utils.get_token_start(prev_token_index, sem_tokens)
+            nxt_tok_pos = utils.get_token_start(next_token_index, sem_tokens)
+            changing_line_text = utils.get_line_of_code(
+                change_start_line, document_lines
+            )
             if not changing_line_text:
                 return sem_tokens
             is_edit_between_tokens = bool(
@@ -134,7 +134,7 @@ class SemTokManager:
                 )
                 if next_token_index is None:
                     return sem_tokens
-                nxt_tok_pos = get_token_start(next_token_index, sem_tokens)
+                nxt_tok_pos = utils.get_token_start(next_token_index, sem_tokens)
                 is_single_line_change = change_end_line == change_start_line
                 is_next_token_same_line = change_end_line == nxt_tok_pos[0]
                 if (
@@ -254,7 +254,7 @@ class SemTokManager:
         change_end_line: int,
     ) -> list[int]:
         """Handle single line deletion between tokens."""
-        if is_next_token_same_line:
+        if is_next_token_same_line and change.range_length:
             sem_tokens[next_token_index + 1] -= change.range_length
 
         else:
@@ -270,6 +270,7 @@ class SemTokManager:
         change: lspt.TextDocumentContentChangeEvent_Type1,
     ) -> list[int]:
         """Handle single line deletion."""
+        assert change.range_length is not None
         sem_tokens[prev_token_index + 2] -= change.range_length
         if is_next_token_same_line:
             sem_tokens[next_token_index + 1] -= change.range_length
@@ -364,7 +365,7 @@ class SemTokManager:
                 else:
                     is_token_boundary_edit = True
                     next_token_index = prev_token_index + 5
-                    nxt_tok_pos = get_token_start(next_token_index, sem_tokens)
+                    nxt_tok_pos = utils.get_token_start(next_token_index, sem_tokens)
                     break
         if not is_token_boundary_edit:
             selected_region = change_end_char - change_start_char
@@ -372,7 +373,10 @@ class SemTokManager:
             sem_tokens[prev_token_index + index_offset] += (
                 len(change.text) - selected_region
             )
-            if prev_tok_pos[0] == get_token_start(prev_token_index + 5, sem_tokens)[0]:
+            if (
+                prev_tok_pos[0]
+                == utils.get_token_start(prev_token_index + 5, sem_tokens)[0]
+            ):
                 sem_tokens[prev_token_index + index_offset + 4] += (
                     len(change.text) - selected_region
                 )

jaclang/langserve/server.py

@@ -19,7 +19,7 @@ server = JacLangServer()
 @server.feature(lspt.TEXT_DOCUMENT_DID_OPEN)
 async def did_open(ls: JacLangServer, params: lspt.DidOpenTextDocumentParams) -> None:
     """Check syntax on change."""
-    ls.deep_check(params.text_document.uri)
+    await ls.launch_deep_check(params.text_document.uri)
     ls.lsp.send_request(lspt.WORKSPACE_SEMANTIC_TOKENS_REFRESH)
 
 
@@ -27,10 +27,8 @@ async def did_open(ls: JacLangServer, params: lspt.DidOpenTextDocumentParams) ->
 async def did_save(ls: JacLangServer, params: lspt.DidOpenTextDocumentParams) -> None:
     """Check syntax on change."""
     file_path = params.text_document.uri
-    if ls.modules[file_path].is_modified:
-        await ls.launch_deep_check(file_path)
-        ls.lsp.send_request(lspt.WORKSPACE_SEMANTIC_TOKENS_REFRESH)
-        ls.modules[file_path].is_modified = False
+    await ls.launch_deep_check(file_path)
+    ls.lsp.send_request(lspt.WORKSPACE_SEMANTIC_TOKENS_REFRESH)
 
 
 @server.feature(lspt.TEXT_DOCUMENT_DID_CHANGE)
@@ -38,16 +36,9 @@ async def did_change(
     ls: JacLangServer, params: lspt.DidChangeTextDocumentParams
 ) -> None:
     """Check syntax on change."""
-    module = ls.modules[params.text_document.uri]
-    module.is_modified = True
-    await ls.launch_quick_check(file_path := params.text_document.uri)
-    if file_path in ls.modules:
-        document = ls.workspace.get_text_document(file_path)
-        lines = document.source.splitlines()
-        ls.modules[file_path].sem_manager.update_sem_tokens(
-            params, ls.modules[file_path].sem_manager.sem_tokens, lines
-        )
-        ls.lsp.send_request(lspt.WORKSPACE_SEMANTIC_TOKENS_REFRESH)
+    file_path = params.text_document.uri
+    await ls.launch_quick_check(file_path)
+    ls.lsp.send_request(lspt.WORKSPACE_SEMANTIC_TOKENS_REFRESH)
 
 
 @server.feature(lspt.TEXT_DOCUMENT_FORMATTING)

jaclang/langserve/tests/fixtures/base_module_structure.jac

@@ -6,12 +6,12 @@ it is assumed to be a module docstring.
 """
 
 """A docstring for add function"""
-can add(a: int, b: int) -> int {
+def add(a: int, b: int) -> int {
     return a + b;
 }
 # No docstring for subtract function
 
-can subtract(a: int, b: int) -> int {
+def subtract(a: int, b: int) -> int {
     return a - b;
 }
 
@@ -31,15 +31,15 @@ obj Colour1 {
     has color1: Colorenum,
         point1: int;
 
-    can get_color1 -> Colorenum;
+    def get_color1 -> Colorenum;
 }
 
-:obj:Colour1:can:get_color1 -> Colorenum {
+impl Colour1.get_color1 -> Colorenum {
 
     return self.color1;
 }
 
-obj red :Colour1: {
+obj red(Colour1) {
     has base_colorred: Colorenum = Colorenum.RED,
         pointred: int = 10;
 
@@ -48,7 +48,7 @@ obj red :Colour1: {
             doublepoint22:doubleinner.double  = 2,
             point22: int = 20;
 
-        can apply_inner_red -> enum_red {
+        def apply_inner_red -> enum_red {
             return self.color22;
         }
         enum enum_red {
@@ -61,7 +61,7 @@ obj red :Colour1: {
         has double: int = 2;
     }
 
-    can apply_red -> int {
+    def apply_red -> int {
         x =
         self.inner_red.color22.GREEN22;
         return self.point1 + self.pointred;

jaclang/langserve/tests/fixtures/circle.jac

@@ -3,13 +3,13 @@ This module demonstrates a simple circle class and a function to calculate
 the area of a circle in all of Jac's glory.
 """
 
-import:py math;
+import math;
 # Module-level global var
 
 glob RAD = 5;
 
 """Function to calculate the area of a circle."""
-can calculate_area(radius: float) -> float {
+def calculate_area(radius: float) -> float {
     return math.pi * radius * radius;
 }
 #* (This is multiline comments in Jac)
@@ -28,18 +28,18 @@ obj Shape {
     has shape_type: ShapeType;
 
     """Abstract method to calculate the area of a shape."""
-    can area -> float abs;
+    def area -> float abs;
 }
 
 """Circle class inherits from Shape."""
-obj Circle :Shape: {
-    can init(radius: float) {
+obj Circle(Shape) {
+    def init(radius: float) {
         super.init(ShapeType.CIRCLE);
         self.radius = radius;
     }
 
     """Overridden method to calculate the area of the circle."""
-    override can area -> float {
+    override def area -> float {
         return math.pi * self.radius * self.radius;
     }
 }

jaclang/langserve/tests/fixtures/circle_err.jac

@@ -3,13 +3,13 @@ This module demonstrates a simple circle class and a function to calculate
 the area of a circle in all of Jac's glory.
 """
 
-import:py math;
+import math;
 # Module-level global var
 
 glob RAD = 5;
 
 """Function to calculate the area of a circle."""
-can calculate_area(radius: float) -> float {
+def calculate_area(radius: float) -> float {
     return math.pi * radius * radius;
 }
 #* (This is multiline comments in Jac)
@@ -28,18 +28,18 @@ obj Shape {
     has shape_type: ShapeType;
 
     """Abstract method to calculate the area of a shape."""
-    can area -> float abs;
+    def area -> float abs;
 }
 
 """Circle class inherits from Shape."""
-obj Circle :Shape: {
-    can init(radius: float) {
+obj Circle(Shape) {
+    def init(radius: float) {
         super.init(ShapeType.CIRCLE);
         self.radius = radius;
     }
 
     """Overridden method to calculate the area of the circle."""
-    override can area -> float {
+    override def area -> float {
         return math.pi * self.radius * self.radius;
     }
 }

jaclang/langserve/tests/fixtures/circle_pure.impl.jac

@@ -1,28 +1,28 @@
 """Enum for shape types"""
 
-:enum:ShapeType {
+impl ShapeType {
     CIRCLE = "Circle",
     UNKNOWN = "Unknown"
 }
 
 """Function to calculate the area of a circle."""
-:can:calculate_area
+impl calculate_area
 (radius: float) -> float {
     return math.pi * radius * radius;
 }
 
-:obj:Circle:can:init
+impl Circle.init
 (radius: float) {
     self.radius = radius;
     super.init(ShapeType.CIRCLE);
 }
 
 """Overridden method to calculate the area of the circle."""
-:obj:Circle:can:area -> float {
+impl Circle.area -> float {
     return math.pi * self.radius * self.radius;
 }
 
-:can:main_run {
+impl main_run {
     print(
         f"Area of a circle with radius {RAD} using function: {calculate_area(RAD)}"
     );

jaclang/langserve/tests/fixtures/circle_pure.jac

@@ -3,26 +3,26 @@ This module demonstrates a simple circle class and a function to calculate
 the area of a circle in all of Jac's glory.
 """
 
-import:py math;
+import math;
 
 enum ShapeType;
 
-can calculate_area(radius: float) -> float;
-can main_run;
+def calculate_area(radius: float) -> float;
+def main_run;
 
 """Base class for a shape."""
 obj : priv Shape {
     has shape_type: ShapeType;
 
-    can area -> float abs;
+    def area -> float abs;
 }
 
 """Circle class inherits from Shape."""
-obj Circle :Shape: {
+obj Circle(Shape) {
     has radius: float;
 
-    can init(radius: float);
-    override can area -> float;
+    def init(radius: float);
+    override def area -> float;
 }
 # Radius of the demo circle
 

jaclang/langserve/tests/fixtures/circle_pure_err.impl.jac

@@ -11,14 +11,14 @@
     return math.pi * radius * radius;
 }
 
-:obj:Circle:can:init
+impl Circle.init
 (radius: float) {
     self.radius = radius;
     super.init(ShapeType.CIRCLE);
 }
 
 """Overridden method to calculate the area of the circle."""
-:obj:Circle:can:area -> float {
+impl Circle.area -> float {
     return math.pi * self.radius * self.radius;
 }
 

jaclang/langserve/tests/fixtures/circle_pure_err.jac

@@ -3,26 +3,26 @@ This module demonstrates a simple circle class and a function to calculate
 the area of a circle in all of Jac's glory.
 """
 
-import:py math;
+import math;
 
 enum ShapeType;
 
-can calculate_area(radius: float) -> float;
-can main_run;
+def calculate_area(radius: float) -> float;
+def main_run;
 
 """Base class for a shape."""
 obj Shape {
     has shape_type: ShapeType;
 
-    can area -> float abs;
+    def area -> float abs;
 }
 
 """Circle class inherits from Shape."""
-obj Circle :Shape: {
+obj Circle(Shape) {
     has radius: float;
 
-    can init(radius: float);
-    can area -> float;
+    def init(radius: float);
+    def area -> float;
 }
 # Radius of the demo circle
 

jaclang/langserve/tests/fixtures/import_include_statements.jac

@@ -1,6 +1,6 @@
-import:py os;
-import:py from math{ sqrt as square_root}
-import:py datetime as dt;
-import:jac from base_module_structure{ add as add_numbers , subtract,x,Colorenum as clr}
-import:jac base_module_structure as base_module_structure;
-import:py from py_import{add1 as ss, sub1 as subtract1,apple,Orange1}
+import os;
+import from math{ sqrt as square_root}
+import datetime as dt;
+import from base_module_structure{ add as add_numbers , subtract,x,Colorenum as clr}
+import base_module_structure as base_module_structure;
+import from py_import{add1 as ss, sub1 as subtract1,apple,Orange1}

jaclang/langserve/tests/fixtures/rename.jac

@@ -1,24 +1,24 @@
-can foo;
+def foo;
 
 
 
-:can:foo{
+impl foo{
     print("foo");
 }
 
 
 obj out{
     has cnt :int;
-    can bar;
-    can baz;
+    def bar;
+    def baz;
 }
 
 
-:obj:out:can:bar{
+impl out.bar{
     print("bar");
 }
 
-:obj:out:can:baz{
+impl out.baz{
     print("baz");
 }