IncludeCPP 3.7.6__tar.gz → 3.7.13__tar.gz

{includecpp-3.7.6 → includecpp-3.7.13}/IncludeCPP.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 3.7.6
+Version: 3.7.13
 Summary: Professional C++ Python bindings with type-generic templates, pystubs and native threading
 Home-page: https://github.com/liliassg/IncludeCPP
 Author: Lilias Hatterscheidt

{includecpp-3.7.6 → includecpp-3.7.13}/IncludeCPP.egg-info/SOURCES.txt

@@ -45,6 +45,8 @@ setup.py
 ./includecpp/vscode/cssl/__init__.py
 ./includecpp/vscode/cssl/language-configuration.json
 ./includecpp/vscode/cssl/package.json
+./includecpp/vscode/cssl/images/cssl.png
+./includecpp/vscode/cssl/images/cssl_pl.png
 ./includecpp/vscode/cssl/snippets/cssl.snippets.json
 ./includecpp/vscode/cssl/syntaxes/cssl.tmLanguage.json
 IncludeCPP.egg-info/PKG-INFO
@@ -94,5 +96,7 @@ includecpp/vscode/__init__.py
 includecpp/vscode/cssl/__init__.py
 includecpp/vscode/cssl/language-configuration.json
 includecpp/vscode/cssl/package.json
+includecpp/vscode/cssl/images/cssl.png
+includecpp/vscode/cssl/images/cssl_pl.png
 includecpp/vscode/cssl/snippets/cssl.snippets.json
 includecpp/vscode/cssl/syntaxes/cssl.tmLanguage.json

{includecpp-3.7.6 → includecpp-3.7.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 3.7.6
+Version: 3.7.13
 Summary: Professional C++ Python bindings with type-generic templates, pystubs and native threading
 Home-page: https://github.com/liliassg/IncludeCPP
 Author: Lilias Hatterscheidt

{includecpp-3.7.6 → includecpp-3.7.13}/includecpp/__init__.py

@@ -2,7 +2,7 @@ from .core.cpp_api import CppApi
 from .core import cssl_bridge as CSSL
 import warnings
 
-__version__ = "3.7.6"
+__version__ = "3.7.13"
 __all__ = ["CppApi", "CSSL"]
 
 # Module-level cache for C++ modules

{includecpp-3.7.6 → includecpp-3.7.13}/includecpp/cli/commands.py

@@ -1193,7 +1193,7 @@ def build(ctx, clean, keep, verbose, no_incremental, incremental, parallel, jobs
 @cli.command()
 @click.argument('module_name')
 def add(module_name):
-    """Create a new module template."""
+    """Create a new module template with sample C++ code."""
     plugins_dir = Path("plugins")
     if not plugins_dir.exists():
         click.echo("Error: plugins/ directory not found")
@@ -1204,6 +1204,7 @@ def add(module_name):
         click.echo(f"Module {module_name} already exists")
         return
 
+    # Create .cp config file
     template = f"""SOURCE(include/{module_name}.cpp) {module_name}
 
 PUBLIC(
@@ -1215,7 +1216,41 @@ PUBLIC(
         f.write(template)
 
     click.echo(f"Created {cp_file}")
-    click.echo(f"Now create include/{module_name}.cpp with your C++ code")
+
+    # Create include/ directory if it doesn't exist
+    include_dir = Path("include")
+    include_dir.mkdir(exist_ok=True)
+
+    # Create .cpp file with sample code
+    cpp_file = include_dir / f"{module_name}.cpp"
+    if not cpp_file.exists():
+        cpp_template = f"""#include <string>
+#include <vector>
+
+namespace includecpp {{
+
+// Example function - returns a greeting
+std::string example_function(const std::string& name) {{
+    return "Hello, " + name + "!";
+}}
+
+// Add more functions here...
+// int add(int a, int b) {{ return a + b; }}
+// std::vector<int> range(int n) {{ ... }}
+
+}} // namespace includecpp
+"""
+        with open(cpp_file, 'w', encoding='utf-8') as f:
+            f.write(cpp_template)
+
+        click.echo(f"Created {cpp_file}")
+    else:
+        click.echo(f"Note: {cpp_file} already exists, skipped")
+
+    click.echo(f"\nNext steps:")
+    click.echo(f"  1. Edit include/{module_name}.cpp to add your functions")
+    click.echo(f"  2. Update plugins/{module_name}.cp to expose functions")
+    click.echo(f"  3. Run: includecpp rebuild")
 
 @cli.command('list')
 def list_modules():
@@ -7823,26 +7858,46 @@ def cssl_vscode():
         click.secho("CSSL extension files not found in package.", fg='red')
         return
 
-    # Install extension
-    target_dir = vscode_ext_dir / 'includecpp.cssl-1.0.0'
+    # Get version from package.json
+    pkg_json = source_ext_dir / 'package.json'
+    current_version = "1.1.0"
+    if pkg_json.exists():
+        try:
+            pkg_data = json.loads(pkg_json.read_text(encoding='utf-8'))
+            current_version = pkg_data.get('version', '1.1.0')
+        except:
+            pass
+
+    target_dir = vscode_ext_dir / f'includecpp.cssl-{current_version}'
 
     try:
+        # Check for existing installations
+        existing_version = None
+        for existing in vscode_ext_dir.glob('includecpp.cssl-*'):
+            existing_version = existing.name.split('-')[-1]
+            if existing_version != current_version:
+                click.echo(f"Removing old version: {existing_version}")
+                shutil.rmtree(existing)
+
         if target_dir.exists():
             shutil.rmtree(target_dir)
 
         shutil.copytree(source_ext_dir, target_dir)
 
-        click.secho("CSSL VSCode extension installed!", fg='green', bold=True)
+        if existing_version and existing_version != current_version:
+            click.secho(f"CSSL extension updated: v{existing_version} -> v{current_version}", fg='green', bold=True)
+        else:
+            click.secho(f"CSSL VSCode extension installed! (v{current_version})", fg='green', bold=True)
         click.echo()
         click.echo(f"Installed to: {target_dir}")
         click.echo()
         click.echo("Features:")
         click.echo("  - Syntax highlighting for .cssl, .cssl-pl, .cssl-mod files")
-        click.echo("  - BruteInjection operators: <==, ==>, <<==, +<==, etc.")
-        click.echo("  - Type highlighting: int, string, stack<T>, datastruct<T>")
+        click.echo("  - OOP support: class, constructor, this->member")
+        click.echo("  - Injection operators: <== (brute), <<== (infuse)")
+        click.echo("  - Type highlighting: int, string, stack<T>, instance<>")
         click.echo("  - Global references: @Name, r@Name, s@Name")
         click.echo("  - Shared objects: $Name")
-        click.echo("  - Filter helpers: string::contains, json::key, etc.")
         click.echo()
         click.secho("Restart VSCode to activate the extension.", fg='yellow')
 
@@ -7866,35 +7921,28 @@ cli.add_command(cssl)
 def vscode(force, stubs_only):
     """Initialize or update VSCode configuration for IncludeCPP/CSSL.
 
-    Sets up .vscode folder with:
-    - CSSL language support (syntax highlighting, snippets)
-    - Type stubs for builtins (.pyi files)
-    - Auto-generated stubs for your plugins and modules
+    Installs CSSL extension globally and sets up project stubs.
 
     \b
     Usage:
-      includecpp vscode           # Initialize .vscode
-      includecpp vscode --force   # Force overwrite existing
+      includecpp vscode           # Install/update extension + stubs
+      includecpp vscode --force   # Force reinstall extension
       includecpp vscode --stubs-only  # Only update stubs
 
     \b
-    What it creates:
-      .vscode/
-        settings.json         - VSCode settings for CSSL
-        cssl/                 - CSSL language extension
-        stubs/                - Type stubs for IDE support
-          cssl_builtins.pyi   - CSSL builtin functions
-          plugins/            - Stubs for your .cp plugins
-          modules/            - Stubs for your modules
+    What it does:
+      1. Installs CSSL extension globally (~/.vscode/extensions/)
+      2. Creates .vscode/settings.json with file associations
+      3. Creates .vscode/stubs/ with type hints for IDE support
     """
     from pathlib import Path as PathLib
+    import os
 
     cwd = PathLib.cwd()
     vscode_dir = cwd / '.vscode'
     stubs_dir = vscode_dir / 'stubs'
     plugins_stubs_dir = stubs_dir / 'plugins'
     modules_stubs_dir = stubs_dir / 'modules'
-    cssl_ext_dir = vscode_dir / 'cssl'
 
     # Create directories
     vscode_dir.mkdir(exist_ok=True)
@@ -7910,56 +7958,79 @@ def vscode(force, stubs_only):
     updated_count = 0
     created_count = 0
 
-    # 1. Copy CSSL extension files (unless stubs-only)
+    # 1. Install CSSL extension GLOBALLY (unless stubs-only)
     if not stubs_only:
-        click.secho("Setting up CSSL language support...", fg='yellow')
+        click.secho("Installing CSSL extension globally...", fg='yellow')
 
         # Find source extension directory
         source_ext_dir = PathLib(__file__).parent.parent / 'vscode' / 'cssl'
 
         if source_ext_dir.exists():
-            cssl_ext_dir.mkdir(exist_ok=True)
-
-            # Copy extension files
-            ext_files = [
-                'language-configuration.json',
-                'package.json',
-            ]
-
-            for fname in ext_files:
-                src = source_ext_dir / fname
-                dst = cssl_ext_dir / fname
-                if src.exists():
-                    if not dst.exists() or force:
-                        shutil.copy2(src, dst)
-                        created_count += 1
-                        click.echo(f"  Created: .vscode/cssl/{fname}")
-
-            # Copy syntaxes folder
-            syntaxes_src = source_ext_dir / 'syntaxes'
-            syntaxes_dst = cssl_ext_dir / 'syntaxes'
-            if syntaxes_src.exists():
-                syntaxes_dst.mkdir(exist_ok=True)
-                for f in syntaxes_src.glob('*.json'):
-                    dst = syntaxes_dst / f.name
-                    if not dst.exists() or force:
-                        shutil.copy2(f, dst)
-                        created_count += 1
-                        click.echo(f"  Created: .vscode/cssl/syntaxes/{f.name}")
-
-            # Copy snippets folder
-            snippets_src = source_ext_dir / 'snippets'
-            snippets_dst = cssl_ext_dir / 'snippets'
-            if snippets_src.exists():
-                snippets_dst.mkdir(exist_ok=True)
-                for f in snippets_src.glob('*.json'):
-                    dst = snippets_dst / f.name
-                    if not dst.exists() or force:
-                        shutil.copy2(f, dst)
-                        created_count += 1
-                        click.echo(f"  Created: .vscode/cssl/snippets/{f.name}")
+            # Get version from package.json
+            pkg_json = source_ext_dir / 'package.json'
+            current_version = "1.1.0"
+            if pkg_json.exists():
+                try:
+                    pkg_data = json.loads(pkg_json.read_text(encoding='utf-8'))
+                    current_version = pkg_data.get('version', '1.1.0')
+                except:
+                    pass
+
+            # Find global VSCode extensions directory
+            if os.name == 'nt':  # Windows
+                global_ext_dir = PathLib(os.environ.get('USERPROFILE', '')) / '.vscode' / 'extensions'
+            else:  # Linux/Mac
+                global_ext_dir = PathLib.home() / '.vscode' / 'extensions'
+
+            if not global_ext_dir.exists():
+                # Try VSCode Insiders
+                if os.name == 'nt':
+                    global_ext_dir = PathLib(os.environ.get('USERPROFILE', '')) / '.vscode-insiders' / 'extensions'
+                else:
+                    global_ext_dir = PathLib.home() / '.vscode-insiders' / 'extensions'
+
+            if global_ext_dir.exists():
+                target_dir = global_ext_dir / f'includecpp.cssl-{current_version}'
+
+                # Check if already installed with same or older version
+                needs_install = force
+                existing_version = None
+
+                # Find existing installations
+                for existing in global_ext_dir.glob('includecpp.cssl-*'):
+                    existing_version = existing.name.split('-')[-1]
+                    if existing_version != current_version:
+                        # Remove old version
+                        click.echo(f"  Removing old version: {existing_version}")
+                        shutil.rmtree(existing)
+                        needs_install = True
+                    elif not force:
+                        click.echo(f"  Already installed: v{current_version}")
+                        needs_install = False
+
+                if not target_dir.exists():
+                    needs_install = True
+
+                if needs_install:
+                    # Remove target if exists (force reinstall)
+                    if target_dir.exists():
+                        shutil.rmtree(target_dir)
+
+                    # Copy extension to global directory
+                    shutil.copytree(source_ext_dir, target_dir)
+                    created_count += 1
+
+                    if existing_version and existing_version != current_version:
+                        click.secho(f"  Updated: v{existing_version} -> v{current_version}", fg='green')
+                    else:
+                        click.secho(f"  Installed: v{current_version}", fg='green')
 
-            click.secho("  CSSL extension configured", fg='green')
+                    click.echo(f"  Location: {target_dir}")
+                    click.echo()
+                    click.secho("  Restart VSCode to activate the extension!", fg='yellow', bold=True)
+            else:
+                click.secho("  VSCode extensions directory not found.", fg='red')
+                click.echo("  Make sure VSCode is installed.")
         else:
             click.secho("  Warning: CSSL extension source not found", fg='yellow')
 

includecpp-3.7.13/includecpp/vscode/cssl/package.json

@@ -0,0 +1,88 @@
+{
+    "name": "cssl",
+    "displayName": "CSSL - CSO Service Script Language",
+    "description": "Professional syntax highlighting, snippets, and language support for CSSL scripts (.cssl, .cssl-pl, .cssl-mod)",
+    "version": "1.2.2",
+    "publisher": "IncludeCPP",
+    "icon": "images/cssl.png",
+    "engines": {
+        "vscode": "^1.60.0"
+    },
+    "categories": [
+        "Programming Languages",
+        "Snippets"
+    ],
+    "keywords": [
+        "cssl",
+        "cso",
+        "script",
+        "includecpp",
+        "c++",
+        "python"
+    ],
+    "contributes": {
+        "languages": [
+            {
+                "id": "cssl",
+                "aliases": ["CSSL", "cssl", "CSO Service Script"],
+                "extensions": [".cssl"],
+                "configuration": "./language-configuration.json",
+                "icon": {
+                    "light": "./images/cssl.png",
+                    "dark": "./images/cssl.png"
+                }
+            },
+            {
+                "id": "cssl-mod",
+                "aliases": ["CSSL Module", "cssl-mod"],
+                "extensions": [".cssl-mod"],
+                "configuration": "./language-configuration.json",
+                "icon": {
+                    "light": "./images/cssl_pl.png",
+                    "dark": "./images/cssl_pl.png"
+                }
+            },
+            {
+                "id": "cssl-pl",
+                "aliases": ["CSSL Payload", "cssl-pl"],
+                "extensions": [".cssl-pl"],
+                "configuration": "./language-configuration.json",
+                "icon": {
+                    "light": "./images/cssl_pl.png",
+                    "dark": "./images/cssl_pl.png"
+                }
+            }
+        ],
+        "grammars": [
+            {
+                "language": "cssl",
+                "scopeName": "source.cssl",
+                "path": "./syntaxes/cssl.tmLanguage.json"
+            },
+            {
+                "language": "cssl-mod",
+                "scopeName": "source.cssl",
+                "path": "./syntaxes/cssl.tmLanguage.json"
+            },
+            {
+                "language": "cssl-pl",
+                "scopeName": "source.cssl",
+                "path": "./syntaxes/cssl.tmLanguage.json"
+            }
+        ],
+        "snippets": [
+            {
+                "language": "cssl",
+                "path": "./snippets/cssl.snippets.json"
+            },
+            {
+                "language": "cssl-mod",
+                "path": "./snippets/cssl.snippets.json"
+            },
+            {
+                "language": "cssl-pl",
+                "path": "./snippets/cssl.snippets.json"
+            }
+        ]
+    }
+}

{includecpp-3.7.6 → includecpp-3.7.13}/includecpp/vscode/cssl/syntaxes/cssl.tmLanguage.json

@@ -27,17 +27,20 @@
         { "include": "#function-calls" },
         { "include": "#builtins" },
         { "include": "#operators" },
-        { "include": "#constants" }
+        { "include": "#constants" },
+        { "include": "#variables" }
     ],
     "repository": {
         "super-functions": {
             "patterns": [
                 {
-                    "name": "markup.bold.super.builtin.cssl",
+                    "comment": "#$run, #$exec, #$printl - yellow/gold color",
+                    "name": "entity.name.tag.super.cssl",
                     "match": "#\\$(run|exec|printl|init)\\b"
                 },
                 {
-                    "name": "markup.bold.super.call.cssl",
+                    "comment": "#$anyFunction - yellow/gold color",
+                    "name": "entity.name.tag.super.cssl",
                     "match": "#\\$[a-zA-Z_][a-zA-Z0-9_]*"
                 }
             ]
@@ -111,22 +114,67 @@
                     "name": "meta.class.cssl",
                     "begin": "\\b(class)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*\\{",
                     "beginCaptures": {
-                        "1": { "name": "keyword.other.class.cssl" },
+                        "1": { "name": "storage.type.class.cssl" },
                         "2": { "name": "entity.name.class.cssl" }
                     },
                     "end": "\\}",
                     "patterns": [
                         { "include": "#comments" },
-                        { "include": "#function-definition" },
+                        { "include": "#constructor-definition" },
+                        { "include": "#class-method-definition" },
+                        { "include": "#class-member-declaration" },
                         { "include": "#types" },
                         { "include": "#this-access" },
+                        { "include": "#captured-references" },
+                        { "include": "#global-references" },
+                        { "include": "#shared-references" },
                         { "include": "#strings" },
                         { "include": "#numbers" },
+                        { "include": "#keywords" },
+                        { "include": "#function-calls" },
+                        { "include": "#builtins" },
                         { "include": "#operators" }
                     ]
                 }
             ]
         },
+        "constructor-definition": {
+            "patterns": [
+                {
+                    "comment": "Constructor: ClassName { ... } or void ClassName(...)",
+                    "name": "meta.constructor.cssl",
+                    "match": "\\b(void\\s+)?([A-Z][a-zA-Z0-9_]*)\\s*(?=\\{|\\()",
+                    "captures": {
+                        "1": { "name": "storage.type.cssl" },
+                        "2": { "name": "entity.name.function.cssl" }
+                    }
+                }
+            ]
+        },
+        "class-method-definition": {
+            "patterns": [
+                {
+                    "name": "meta.method.cssl",
+                    "match": "\\b(void|int|string|float|bool|dynamic|define|shuffled)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*\\(",
+                    "captures": {
+                        "1": { "name": "storage.type.cssl" },
+                        "2": { "name": "entity.name.function.cssl" }
+                    }
+                }
+            ]
+        },
+        "class-member-declaration": {
+            "patterns": [
+                {
+                    "name": "meta.member.cssl",
+                    "match": "\\b(int|string|float|bool|dynamic|auto)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\s*;",
+                    "captures": {
+                        "1": { "name": "storage.type.cssl" },
+                        "2": { "name": "variable.other.member.cssl" }
+                    }
+                }
+            ]
+        },
         "function-definition": {
             "patterns": [
                 {
@@ -158,12 +206,24 @@
                     "match": "\\b(if|else|elif|while|for|foreach|in|range|switch|case|default|break|continue|return|try|catch|finally|throw)\\b"
                 },
                 {
-                    "name": "keyword.other.class.cssl",
-                    "match": "\\b(class|new|this)\\b"
+                    "name": "storage.type.class.cssl",
+                    "match": "\\b(class|struct|structure|enum|interface)\\b"
+                },
+                {
+                    "name": "keyword.operator.new.cssl",
+                    "match": "\\bnew\\b"
+                },
+                {
+                    "name": "variable.language.this.cssl",
+                    "match": "\\bthis\\b"
+                },
+                {
+                    "name": "storage.type.function.cssl",
+                    "match": "\\b(define|void|shuffled)\\b"
                 },
                 {
                     "name": "keyword.other.cssl",
-                    "match": "\\b(service-init|service-run|service-include|struct|structure|define|main|package|package-includes|exec|as|global|include|get|payload|convert)\\b"
+                    "match": "\\b(service-init|service-run|service-include|main|package|package-includes|exec|as|global|include|get|payload|convert)\\b"
                 },
                 {
                     "name": "keyword.operator.logical.cssl",
@@ -182,19 +242,19 @@
                     "match": "\\b(int|string|float|bool|void|json|dynamic|auto|long|double)\\b"
                 },
                 {
-                    "name": "storage.type.container.cssl",
-                    "match": "\\b(array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|instance|tuple|set|queue)\\b"
-                },
-                {
-                    "name": "storage.type.generic.cssl",
-                    "match": "\\b(array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|instance|tuple|set|queue)\\s*<",
+                    "comment": "Generic containers with type parameter: vector<int>, map<string, int>",
+                    "name": "meta.generic.cssl",
+                    "match": "(\\b(?:array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|tuple|set|queue))(<)([^>]+)(>)",
                     "captures": {
-                        "1": { "name": "storage.type.container.cssl" }
+                        "1": { "name": "storage.type.container.cssl" },
+                        "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
+                        "3": { "name": "storage.type.parameter.cssl" },
+                        "4": { "name": "punctuation.definition.typeparameters.end.cssl" }
                     }
                 },
                 {
-                    "name": "storage.type.map-literal.cssl",
-                    "match": "\\bmap\\s*<[^>]+>\\s*\\{"
+                    "name": "storage.type.container.cssl",
+                    "match": "\\b(array|vector|stack|list|dictionary|dict|map|datastruct|dataspace|shuffled|iterator|combo|openquote|instance|tuple|set|queue)\\b"
                 },
                 {
                     "name": "storage.type.combo-open.cssl",
@@ -213,19 +273,23 @@
         "injection-operators": {
             "patterns": [
                 {
-                    "name": "entity.name.tag.infuse.cssl",
+                    "comment": "Infuse operators <<== (REPLACE) - orange color",
+                    "name": "constant.character.escape.infuse.cssl",
                     "match": "(\\+<<==|<<==|-<<==)"
                 },
                 {
-                    "name": "entity.name.tag.infuse.out.cssl",
+                    "comment": "Infuse out operators ==>> - orange color",
+                    "name": "constant.character.escape.infuse.out.cssl",
                     "match": "(==>>\\+|==>>|-==>>)"
                 },
                 {
-                    "name": "keyword.operator.injection.brute.cssl",
+                    "comment": "Brute injection <== (ADD) - cyan/blue color",
+                    "name": "support.function.brute.cssl",
                     "match": "(\\+<==|<==|-<==)"
                 },
                 {
-                    "name": "keyword.operator.injection.brute.out.cssl",
+                    "comment": "Brute injection out ==> - cyan/blue color",
+                    "name": "support.function.brute.out.cssl",
                     "match": "(==>\\+|==>|-==>)"
                 },
                 {
@@ -293,23 +357,30 @@
         "captured-references": {
             "patterns": [
                 {
-                    "name": "variable.other.captured.cssl",
-                    "match": "%[a-zA-Z_][a-zA-Z0-9_]*"
+                    "comment": "%identifier - % is light blue/cyan, identifier is pink",
+                    "match": "(%)([a-zA-Z_][a-zA-Z0-9_]*)",
+                    "captures": {
+                        "1": { "name": "support.type.cssl" },
+                        "2": { "name": "entity.other.inherited-class.cssl" }
+                    }
                 }
             ]
         },
         "global-references": {
             "patterns": [
                 {
-                    "name": "variable.other.global.cssl",
+                    "comment": "@identifier - magenta color (full)",
+                    "name": "constant.other.symbol.cssl",
                     "match": "@[a-zA-Z_][a-zA-Z0-9_]*"
                 },
                 {
-                    "name": "variable.other.global-decl.cssl",
+                    "comment": "r@identifier - magenta color",
+                    "name": "constant.other.symbol.cssl",
                     "match": "r@[a-zA-Z_][a-zA-Z0-9_]*"
                 },
                 {
-                    "name": "variable.other.self-ref.cssl",
+                    "comment": "s@identifier - magenta color",
+                    "name": "constant.other.symbol.cssl",
                     "match": "s@[a-zA-Z_][a-zA-Z0-9_]*"
                 }
             ]
@@ -317,16 +388,44 @@
         "shared-references": {
             "patterns": [
                 {
-                    "name": "variable.other.shared.cssl",
+                    "comment": "$identifier - same color as 'new' keyword (full)",
+                    "name": "keyword.operator.new.cssl",
                     "match": "\\$[a-zA-Z_][a-zA-Z0-9_]*"
                 }
             ]
         },
+        "variables": {
+            "patterns": [
+                {
+                    "comment": "Regular variables - pink/salmon color",
+                    "name": "entity.other.inherited-class.cssl",
+                    "match": "\\b[a-z_][a-zA-Z0-9_]*\\b"
+                }
+            ]
+        },
         "instance-references": {
             "patterns": [
                 {
-                    "name": "storage.type.instance.cssl",
-                    "match": "\\binstance<\"[^\"]+\">"
+                    "comment": "instance<\"name\"> - shared instance reference with string",
+                    "name": "meta.instance.cssl",
+                    "match": "(\\binstance)(<)(\"[^\"]+\")(>)",
+                    "captures": {
+                        "1": { "name": "storage.type.instance.cssl" },
+                        "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
+                        "3": { "name": "string.quoted.double.cssl" },
+                        "4": { "name": "punctuation.definition.typeparameters.end.cssl" }
+                    }
+                },
+                {
+                    "comment": "instance<Type> - shared instance reference with type",
+                    "name": "meta.instance.cssl",
+                    "match": "(\\binstance)(<)([a-zA-Z_][a-zA-Z0-9_]*)(>)",
+                    "captures": {
+                        "1": { "name": "storage.type.instance.cssl" },
+                        "2": { "name": "punctuation.definition.typeparameters.begin.cssl" },
+                        "3": { "name": "entity.name.type.cssl" },
+                        "4": { "name": "punctuation.definition.typeparameters.end.cssl" }
+                    }
                 }
             ]
         },

{includecpp-3.7.6 → includecpp-3.7.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "IncludeCPP"
-version = "3.7.6"
+version = "3.7.13"
 description = "Professional C++ Python bindings with type-generic templates, pystubs and native threading"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -63,5 +63,6 @@ includecpp = [
     "cli/*.pyi",
     "vscode/cssl/*.json",
     "vscode/cssl/syntaxes/*.json",
-    "vscode/cssl/snippets/*.json"
+    "vscode/cssl/snippets/*.json",
+    "vscode/cssl/images/*.png"
 ]

includecpp-3.7.6/includecpp/vscode/cssl/package.json

@@ -1,50 +0,0 @@
-{
-    "name": "cssl",
-    "displayName": "CSSL - CSO Service Script Language",
-    "description": "Professional syntax highlighting, snippets, and language support for CSSL scripts (.cssl, .cssl-pl, .cssl-mod)",
-    "version": "1.1.0",
-    "publisher": "IncludeCPP",
-    "icon": "images/cssl-icon.png",
-    "engines": {
-        "vscode": "^1.60.0"
-    },
-    "categories": [
-        "Programming Languages",
-        "Snippets"
-    ],
-    "keywords": [
-        "cssl",
-        "cso",
-        "script",
-        "includecpp",
-        "c++",
-        "python"
-    ],
-    "contributes": {
-        "languages": [
-            {
-                "id": "cssl",
-                "aliases": ["CSSL", "cssl", "CSO Service Script"],
-                "extensions": [".cssl", ".cssl-pl", ".cssl-mod"],
-                "configuration": "./language-configuration.json",
-                "icon": {
-                    "light": "./images/cssl-icon.png",
-                    "dark": "./images/cssl-icon.png"
-                }
-            }
-        ],
-        "grammars": [
-            {
-                "language": "cssl",
-                "scopeName": "source.cssl",
-                "path": "./syntaxes/cssl.tmLanguage.json"
-            }
-        ],
-        "snippets": [
-            {
-                "language": "cssl",
-                "path": "./snippets/cssl.snippets.json"
-            }
-        ]
-    }
-}