jupyterlab_vscode_icons_extension 1.1.8 → 1.1.22

package/README.md

@@ -21,7 +21,7 @@ This extension brings 1414 beautiful file type icons from the vscode-icons proje
 - Zero configuration required - just install and enjoy
 - Lightweight integration using Iconify's JSON icon format
 - Compatible with Jupytext - properly displays Python and Markdown icons for .py and .md notebook files
-- No folders (we left those alone... for now)
+- Python package folder detection - folders declared in `pyproject.toml` or `setup.py` get a special Python package icon
 
 ## Requirements
 

package/lib/index.js

@@ -1,7 +1,9 @@
+import { PageConfig, URLExt } from '@jupyterlab/coreutils';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { IDefaultFileBrowser } from '@jupyterlab/filebrowser';
 import { LabIcon } from '@jupyterlab/ui-components';
 import { getIconSVG } from './icons';
+import { parsePyprojectToml, parseSetupPy } from './parsers';
 const PLUGIN_ID = 'jupyterlab_vscode_icons_extension:plugin';
 /**
  * Create a LabIcon from vscode-icons SVG data
@@ -127,7 +129,7 @@ const fileTypeConfigs = [
         iconName: 'file-type-perl',
         group: 'enableLanguageIcons'
     },
-    // Shell scripts (.sh, .bash, .zsh) and batch files (.bat, .cmd) use custom icons with black backgrounds
+    // Shell scripts (.sh, .bash, .zsh, .fish, .csh, .nu) and batch files (.bat, .cmd) use custom icons with black backgrounds
     // Registered separately below with custom SVGs
     {
         extensions: ['.ps1'],
@@ -442,6 +444,11 @@ const plugin = {
             const pytestDataUri = `data:image/svg+xml;base64,${btoa(pytestSvg)}`;
             const pythonPackageSvg = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><defs><linearGradient id="ppa" x1="0%" y1="0%" x2="100%" y2="100%"><stop offset="0" stop-color="#387eb8"/><stop offset="1" stop-color="#366994"/></linearGradient><linearGradient id="ppb" x1="0%" y1="0%" x2="100%" y2="100%"><stop offset="0" stop-color="#ffe052"/><stop offset="1" stop-color="#ffc331"/></linearGradient></defs><g transform="scale(-1,1) translate(-32,0)"><path d="M27.4,5.5H18.1L16,9.7H4.3V26.5H29.5V5.5Zm0,4.2H19.2l1.1-2.1h7.1Z" fill="#58af7b"/><path d="M20.9,11c-5.1,0-4.8,2.2-4.8,2.2v2.3H21v.7H14.2S11,15.8,11,21s2.9,5,2.9,5h1.7V23.6a2.7,2.7,0,0,1,2.8-2.9h4.8a2.6,2.6,0,0,0,2.7-2.6V13.7S26.2,11,20.9,11Zm-2.7,1.5a.9.9,0,1,1-.8.9.9.9,0,0,1,.8-.9Z" fill="url(#ppa)"/><path d="M21.1,31c5.1,0,4.8-2.2,4.8-2.2V26.5H21v-.7h6.8S31,26.1,31,21s-2.9-5-2.9-5h-1.7v2.4a2.7,2.7,0,0,1-2.8,2.9H18.8a2.6,2.6,0,0,0-2.7,2.6v4.4S15.7,31,21,31Zm2.7-1.5a.9.9,0,1,1,.8-.9.9.9,0,0,1-.8.9Z" fill="url(#ppb)"/></g></svg>';
             const pythonPackageDataUri = `data:image/svg+xml;base64,${btoa(pythonPackageSvg)}`;
+            const venvSvg = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><g transform="scale(-1,1) translate(-32,0)"><path d="M27.4,5.5H18.1L16,9.7H4.3V26.5H29.5V5.5Zm0,4.2H19.2l1.1-2.1h7.1Z" fill="#9575cd"/><g transform="translate(22,22) scale(1.25)" fill="#bababa"><path d="M-1.2,-6 L1.2,-6 L1.5,-4.5 L2.8,-4 L4,-5 L5.5,-3.5 L4.5,-2.3 L5,-1 L6.5,-0.8 L6.5,1.2 L5,1.5 L4.5,2.8 L5.5,4 L4,5.5 L2.8,4.5 L1.5,5 L1.2,6.5 L-1.2,6.5 L-1.5,5 L-2.8,4.5 L-4,5.5 L-5.5,4 L-4.5,2.8 L-5,1.5 L-6.5,1.2 L-6.5,-0.8 L-5,-1 L-4.5,-2.3 L-5.5,-3.5 L-4,-5 L-2.8,-4 L-1.5,-4.5 Z"/><circle cx="0" cy="0" r="2.5" fill="#9575cd"/></g></g></svg>';
+            const venvDataUri = `data:image/svg+xml;base64,${btoa(venvSvg)}`;
+            // Executable file icon - JupyterLab standard file icon with play triangle overlay
+            const executableSvg = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path fill="#616161" d="m19.3 8.2-5.5-5.5c-.3-.3-.7-.5-1.2-.5H3.9c-.8.1-1.6.9-1.6 1.8v14.1c0 .9.7 1.6 1.6 1.6h14.2c.9 0 1.6-.7 1.6-1.6V9.4c.1-.5-.1-.9-.4-1.2m-5.8-3.3 3.4 3.6h-3.4zm3.9 12.7H4.7c-.1 0-.2 0-.2-.2V4.7c0-.2.1-.3.2-.3h7.2v4.4s0 .8.3 1.1 1.1.3 1.1.3h4.3v7.2s-.1.2-.2.2"/><path fill="#66bb6a" d="M12,12 L20,16 L12,20 Z"/></svg>';
+            const executableDataUri = `data:image/svg+xml;base64,${btoa(executableSvg)}`;
             // Inject CSS that overrides icons for .py and .md files
             // Note: Jupytext marks .py and .md files as type="notebook", so we need to
             // use JavaScript to detect and mark these files for CSS targeting
@@ -645,6 +652,38 @@ const plugin = {
           background-repeat: no-repeat;
           background-position: center;
         }
+
+        /* Override venv folder icons (.venv, venv, .env, env) */
+        .jp-DirListing-item[data-venv-folder] .jp-DirListing-itemIcon svg,
+        .jp-DirListing-item[data-venv-folder] .jp-DirListing-itemIcon img {
+          display: none !important;
+        }
+        .jp-DirListing-item[data-venv-folder] .jp-DirListing-itemIcon::before {
+          content: '';
+          display: inline-block;
+          width: calc(var(--jp-ui-font-size1, 13px) * var(--jp-custom-icon-scale, 1.5));
+          height: calc(var(--jp-ui-font-size1, 13px) * var(--jp-custom-icon-scale, 1.5));
+          background-image: url('${venvDataUri}');
+          background-size: contain;
+          background-repeat: no-repeat;
+          background-position: center;
+        }
+
+        /* Override executable file icons */
+        .jp-DirListing-item[data-executable] .jp-DirListing-itemIcon svg,
+        .jp-DirListing-item[data-executable] .jp-DirListing-itemIcon img {
+          display: none !important;
+        }
+        .jp-DirListing-item[data-executable] .jp-DirListing-itemIcon::before {
+          content: '';
+          display: inline-block;
+          width: calc(var(--jp-ui-font-size1, 13px) * var(--jp-custom-icon-scale, 1.5));
+          height: calc(var(--jp-ui-font-size1, 13px) * var(--jp-custom-icon-scale, 1.5));
+          background-image: url('${executableDataUri}');
+          background-size: contain;
+          background-repeat: no-repeat;
+          background-position: center;
+        }
       `;
             // Add CSS to make JavaScript and .env icons less bright
             style.textContent += `
@@ -666,71 +705,91 @@ const plugin = {
           opacity: 55% !important;
         }
       `;
-            // Cache for Python package folder checks
-            const pythonPackageCache = new Map();
-            // Folders to exclude from Python package checking
-            const excludedFolderPatterns = [
-                /^\.git$/,
-                /^\.hg$/,
-                /^\.svn$/,
-                /^\.venv$/,
-                /^venv$/,
-                /^\.env$/,
-                /^env$/,
-                /^node_modules$/,
-                /^__pycache__$/,
-                /^\.ipynb_checkpoints$/,
-                /^\.pytest_cache$/,
-                /^\.mypy_cache$/,
-                /^\.ruff_cache$/,
-                /^\.tox$/,
-                /^\.nox$/,
-                /^\.coverage$/,
-                /^htmlcov$/,
-                /^dist$/,
-                /^build$/,
-                /^\.eggs$/,
-                /\.egg-info$/,
-                /\.dist-info$/
-            ];
-            const isExcludedFolder = (name) => {
-                return excludedFolderPatterns.some(pattern => pattern.test(name));
-            };
-            // Check if a folder is a Python package (contains __init__.py)
-            // Use the file browser's model to get the correct path
-            const checkPythonPackage = async (folderName) => {
-                var _a;
-                // Skip excluded folders
-                if (isExcludedFolder(folderName)) {
-                    return false;
+            // Cache for Python package detection (per directory)
+            let pythonPackagesCache = null;
+            // Detect Python packages by parsing pyproject.toml or setup.py
+            const detectPythonPackages = async () => {
+                const currentPath = (defaultFileBrowser === null || defaultFileBrowser === void 0 ? void 0 : defaultFileBrowser.model.path) || '';
+                // Return cached result if same directory
+                if ((pythonPackagesCache === null || pythonPackagesCache === void 0 ? void 0 : pythonPackagesCache.path) === currentPath) {
+                    return pythonPackagesCache.packages;
+                }
+                const packages = new Set();
+                try {
+                    const contents = await app.serviceManager.contents.get(currentPath, {
+                        content: true
+                    });
+                    const files = contents.content || [];
+                    // Check for pyproject.toml
+                    const hasPyproject = files.some((f) => f.name === 'pyproject.toml');
+                    if (hasPyproject) {
+                        const pyprojectPath = currentPath
+                            ? `${currentPath}/pyproject.toml`
+                            : 'pyproject.toml';
+                        const file = await app.serviceManager.contents.get(pyprojectPath);
+                        const content = file.content;
+                        const parsed = parsePyprojectToml(content);
+                        parsed.forEach(p => packages.add(p));
+                    }
+                    // Check for setup.py
+                    const hasSetupPy = files.some((f) => f.name === 'setup.py');
+                    if (hasSetupPy) {
+                        const setupPath = currentPath
+                            ? `${currentPath}/setup.py`
+                            : 'setup.py';
+                        const file = await app.serviceManager.contents.get(setupPath);
+                        const content = file.content;
+                        const parsed = parseSetupPy(content);
+                        parsed.forEach(p => packages.add(p));
+                    }
                 }
-                // Get the current path from the file browser model
-                if (!defaultFileBrowser) {
-                    return false;
+                catch (_a) {
+                    // Ignore errors - no packages detected
                 }
-                const currentPath = defaultFileBrowser.model.path;
-                const fullPath = currentPath
-                    ? `${currentPath}/${folderName}`
-                    : folderName;
-                if (pythonPackageCache.has(fullPath)) {
-                    return pythonPackageCache.get(fullPath);
+                pythonPackagesCache = { path: currentPath, packages };
+                return packages;
+            };
+            // Cache for executable file detection (per directory)
+            let executablesCache = null;
+            // Detect executable files via server API
+            const detectExecutables = async () => {
+                if (!settings.enableExecutableIcons) {
+                    return new Set();
                 }
+                const currentPath = (defaultFileBrowser === null || defaultFileBrowser === void 0 ? void 0 : defaultFileBrowser.model.path) || '';
+                // Return cached result if same directory
+                if ((executablesCache === null || executablesCache === void 0 ? void 0 : executablesCache.path) === currentPath) {
+                    return executablesCache.executables;
+                }
+                const executables = new Set();
                 try {
-                    // Use JupyterLab's contents manager with the correct path from file browser
-                    const contents = app.serviceManager.contents;
-                    const model = await contents.get(fullPath, { content: true });
-                    const hasInit = ((_a = model.content) === null || _a === void 0 ? void 0 : _a.some((item) => item.name === '__init__.py')) ||
-                        false;
-                    pythonPackageCache.set(fullPath, hasInit);
-                    return hasInit;
+                    const baseUrl = PageConfig.getBaseUrl();
+                    const apiUrl = URLExt.join(baseUrl, 'vscode-icons', 'executables');
+                    const response = await fetch(`${apiUrl}?path=${encodeURIComponent(currentPath)}`);
+                    if (response.ok) {
+                        const files = await response.json();
+                        files.forEach(f => executables.add(f));
+                    }
                 }
-                catch (_b) {
-                    pythonPackageCache.set(fullPath, false);
-                    return false;
+                catch (_a) {
+                    // Ignore errors - no executables detected
                 }
+                executablesCache = { path: currentPath, executables };
+                return executables;
             };
+            // Invalidate cache on directory change
+            if (defaultFileBrowser) {
+                defaultFileBrowser.model.pathChanged.connect(() => {
+                    pythonPackagesCache = null;
+                    executablesCache = null;
+                });
+            }
             // Add a MutationObserver to mark special files in the file browser
-            const markSpecialFiles = () => {
+            const markSpecialFiles = async () => {
+                // Get Python packages for current directory (cached)
+                const pythonPackages = await detectPythonPackages();
+                // Get executable files for current directory (cached, only if setting enabled)
+                const executables = await detectExecutables();
                 // Process ALL items - clear wrong attributes and set correct ones
                 const allItems = document.querySelectorAll('.jp-DirListing-item');
                 allItems.forEach(item => {
@@ -809,29 +868,48 @@ const plugin = {
                         nameLower === 'conftest.py') {
                         item.setAttribute('data-pytest', 'true');
                     }
+                    // Mark executable files if setting is enabled (uses server API for +x detection)
+                    item.removeAttribute('data-executable');
+                    if (settings.enableExecutableIcons && executables.has(name)) {
+                        item.setAttribute('data-executable', 'true');
+                    }
                     // Check if this is a directory (folder)
                     const isDir = fileType === 'directory' ||
                         item.classList.contains('jp-DirListing-directory');
                     if (isDir) {
-                        // Check if this folder is a Python package (async)
-                        // Pass just the folder name - checkPythonPackage gets current path from file browser
-                        checkPythonPackage(name).then(isPythonPackage => {
-                            if (isPythonPackage) {
+                        // Check if folder is a venv folder (.venv, venv, .env, env)
+                        const venvNames = ['.venv', 'venv', '.env', 'env'];
+                        if (venvNames.includes(nameLower)) {
+                            item.setAttribute('data-venv-folder', 'true');
+                            item.removeAttribute('data-python-package');
+                        }
+                        else {
+                            item.removeAttribute('data-venv-folder');
+                            // Check if folder name matches a detected Python package
+                            if (pythonPackages.has(name)) {
                                 item.setAttribute('data-python-package', 'true');
                             }
                             else {
                                 item.removeAttribute('data-python-package');
                             }
-                        });
+                        }
                     }
                     else {
                         item.removeAttribute('data-python-package');
+                        item.removeAttribute('data-venv-folder');
                     }
                 });
             };
-            // Watch for changes in the file browser
+            // Debounce timeout for MutationObserver
+            let markSpecialFilesTimeout = null;
+            // Watch for changes in the file browser (debounced)
             const observer = new MutationObserver(() => {
-                markSpecialFiles();
+                if (markSpecialFilesTimeout) {
+                    clearTimeout(markSpecialFilesTimeout);
+                }
+                markSpecialFilesTimeout = setTimeout(() => {
+                    markSpecialFiles();
+                }, 100);
             });
             // Start observing when the file browser is ready
             setTimeout(() => {
@@ -862,7 +940,8 @@ const plugin = {
             enableDataIcons: true,
             enableConfigIcons: true,
             enableDocIcons: true,
-            enableImageIcons: true
+            enableImageIcons: true,
+            enableExecutableIcons: false
         };
         // Function to register file types based on settings
         const registerFileTypes = () => {
@@ -1015,7 +1094,7 @@ const plugin = {
                 docRegistry.addFileType({
                     name: 'vscode-shell',
                     displayName: 'Shell Script',
-                    extensions: ['.sh', '.bash', '.zsh'],
+                    extensions: ['.sh', '.bash', '.zsh', '.fish', '.csh', '.nu'],
                     fileFormat: 'text',
                     contentType: 'file',
                     icon: shellIcon

package/lib/parsers.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Python package configuration file parsers
+ * Extracts package names from pyproject.toml and setup.py files
+ */
+/**
+ * Parse pyproject.toml content to extract Python package names
+ * @param content - The content of pyproject.toml file
+ * @returns Set of package names found in the file
+ */
+export declare function parsePyprojectToml(content: string): Set<string>;
+/**
+ * Parse setup.py content to extract Python package names
+ * @param content - The content of setup.py file
+ * @returns Set of package names found in the file
+ */
+export declare function parseSetupPy(content: string): Set<string>;

package/lib/parsers.js

@@ -0,0 +1,47 @@
+/**
+ * Python package configuration file parsers
+ * Extracts package names from pyproject.toml and setup.py files
+ */
+/**
+ * Parse pyproject.toml content to extract Python package names
+ * @param content - The content of pyproject.toml file
+ * @returns Set of package names found in the file
+ */
+export function parsePyprojectToml(content) {
+    const packages = new Set();
+    // Parse [project] name = "package_name"
+    const nameMatch = content.match(/\[project\][^[]*name\s*=\s*["']([^"']+)["']/s);
+    if (nameMatch) {
+        packages.add(nameMatch[1]);
+        // Also add underscore variant (package-name -> package_name)
+        packages.add(nameMatch[1].replace(/-/g, '_'));
+    }
+    // Parse packages = ["pkg1", "pkg2"]
+    const packagesMatch = content.match(/packages\s*=\s*\[([^\]]+)\]/);
+    if (packagesMatch) {
+        const pkgList = packagesMatch[1].match(/["']([^"']+)["']/g);
+        pkgList === null || pkgList === void 0 ? void 0 : pkgList.forEach(p => packages.add(p.replace(/["']/g, '')));
+    }
+    return packages;
+}
+/**
+ * Parse setup.py content to extract Python package names
+ * @param content - The content of setup.py file
+ * @returns Set of package names found in the file
+ */
+export function parseSetupPy(content) {
+    const packages = new Set();
+    // Parse packages=["pkg1", "pkg2"]
+    const packagesMatch = content.match(/packages\s*=\s*\[([^\]]+)\]/);
+    if (packagesMatch) {
+        const pkgList = packagesMatch[1].match(/["']([^"']+)["']/g);
+        pkgList === null || pkgList === void 0 ? void 0 : pkgList.forEach(p => packages.add(p.replace(/["']/g, '')));
+    }
+    // Parse name="package_name"
+    const nameMatch = content.match(/name\s*=\s*["']([^"']+)["']/);
+    if (nameMatch) {
+        packages.add(nameMatch[1]);
+        packages.add(nameMatch[1].replace(/-/g, '_'));
+    }
+    return packages;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyterlab_vscode_icons_extension",
-    "version": "1.1.8",
+    "version": "1.1.22",
     "description": "Jupyterlab extension with a shameless rip-off of the vscode-icons into our beloved environment",
     "keywords": [
         "jupyter",

package/src/__tests__/parsers.spec.ts

@@ -0,0 +1,342 @@
+/**
+ * Tests for Python package configuration file parsers
+ */
+
+import { parsePyprojectToml, parseSetupPy } from '../parsers';
+
+describe('parsePyprojectToml', () => {
+  describe('project name parsing', () => {
+    it('should parse project name with double quotes', () => {
+      const content = `
+[project]
+name = "my-package"
+version = "1.0.0"
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('my-package')).toBe(true);
+      expect(result.has('my_package')).toBe(true);
+    });
+
+    it('should parse project name with single quotes', () => {
+      const content = `
+[project]
+name = 'my-package'
+version = '1.0.0'
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('my-package')).toBe(true);
+      expect(result.has('my_package')).toBe(true);
+    });
+
+    it('should handle name without hyphens', () => {
+      const content = `
+[project]
+name = "mypackage"
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('mypackage')).toBe(true);
+      // underscore variant is same as original
+      expect(result.size).toBe(1);
+    });
+
+    it('should handle name with multiple hyphens', () => {
+      const content = `
+[project]
+name = "my-awesome-package"
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('my-awesome-package')).toBe(true);
+      expect(result.has('my_awesome_package')).toBe(true);
+    });
+
+    it('should handle whitespace around equals sign', () => {
+      const content = `
+[project]
+name="my-package"
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('my-package')).toBe(true);
+    });
+
+    it('should handle extra whitespace', () => {
+      const content = `
+[project]
+name   =   "my-package"
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('my-package')).toBe(true);
+    });
+  });
+
+  describe('packages array parsing', () => {
+    it('should parse packages array with double quotes', () => {
+      const content = `
+[tool.setuptools]
+packages = ["pkg1", "pkg2", "pkg3"]
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('pkg1')).toBe(true);
+      expect(result.has('pkg2')).toBe(true);
+      expect(result.has('pkg3')).toBe(true);
+    });
+
+    it('should parse packages array with single quotes', () => {
+      const content = `
+[tool.setuptools]
+packages = ['pkg1', 'pkg2']
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('pkg1')).toBe(true);
+      expect(result.has('pkg2')).toBe(true);
+    });
+
+    it('should parse packages array with mixed quotes', () => {
+      const content = `
+packages = ["pkg1", 'pkg2']
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('pkg1')).toBe(true);
+      expect(result.has('pkg2')).toBe(true);
+    });
+
+    it('should parse multiline packages array', () => {
+      const content = `
+packages = [
+    "pkg1",
+    "pkg2",
+    "pkg3"
+]
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('pkg1')).toBe(true);
+      expect(result.has('pkg2')).toBe(true);
+      expect(result.has('pkg3')).toBe(true);
+    });
+
+    it('should parse single package in array', () => {
+      const content = `
+packages = ["single_pkg"]
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('single_pkg')).toBe(true);
+    });
+  });
+
+  describe('combined parsing', () => {
+    it('should parse both project name and packages array', () => {
+      const content = `
+[project]
+name = "main-package"
+version = "1.0.0"
+
+[tool.setuptools]
+packages = ["subpkg1", "subpkg2"]
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('main-package')).toBe(true);
+      expect(result.has('main_package')).toBe(true);
+      expect(result.has('subpkg1')).toBe(true);
+      expect(result.has('subpkg2')).toBe(true);
+    });
+
+    it('should handle real-world pyproject.toml', () => {
+      const content = `
+[build-system]
+requires = ["hatchling>=1.5.0", "jupyterlab>=4.0.0,<5"]
+build-backend = "hatchling.build"
+
+[project]
+name = "jupyterlab_vscode_icons_extension"
+version = "1.1.9"
+description = "VSCode-style file icons for JupyterLab"
+readme = "README.md"
+license = { file = "LICENSE" }
+requires-python = ">=3.8"
+classifiers = [
+    "Framework :: Jupyter",
+    "Framework :: Jupyter :: JupyterLab",
+    "Framework :: Jupyter :: JupyterLab :: 4",
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+]
+
+[tool.hatch.build.targets.wheel.shared-data]
+"jupyterlab_vscode_icons_extension/labextension" = "share/jupyter/labextensions/jupyterlab_vscode_icons_extension"
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('jupyterlab_vscode_icons_extension')).toBe(true);
+    });
+  });
+
+  describe('edge cases', () => {
+    it('should return empty set for empty content', () => {
+      const result = parsePyprojectToml('');
+      expect(result.size).toBe(0);
+    });
+
+    it('should return empty set for content without project section', () => {
+      const content = `
+[build-system]
+requires = ["hatchling"]
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.size).toBe(0);
+    });
+
+    it('should not match name outside [project] section', () => {
+      const content = `
+[other-section]
+name = "wrong-package"
+
+[project]
+version = "1.0.0"
+`;
+      const result = parsePyprojectToml(content);
+      expect(result.has('wrong-package')).toBe(false);
+    });
+  });
+});
+
+describe('parseSetupPy', () => {
+  describe('name parsing', () => {
+    it('should parse name with double quotes', () => {
+      const content = `
+from setuptools import setup
+
+setup(
+    name="my-package",
+    version="1.0.0",
+)
+`;
+      const result = parseSetupPy(content);
+      expect(result.has('my-package')).toBe(true);
+      expect(result.has('my_package')).toBe(true);
+    });
+
+    it('should parse name with single quotes', () => {
+      const content = `
+setup(
+    name='my-package',
+)
+`;
+      const result = parseSetupPy(content);
+      expect(result.has('my-package')).toBe(true);
+    });
+
+    it('should handle name without hyphens', () => {
+      const content = `
+setup(name="mypackage")
+`;
+      const result = parseSetupPy(content);
+      expect(result.has('mypackage')).toBe(true);
+    });
+  });
+
+  describe('packages array parsing', () => {
+    it('should parse packages array inline', () => {
+      const content = `
+setup(
+    packages=["pkg1", "pkg2", "pkg3"],
+)
+`;
+      const result = parseSetupPy(content);
+      expect(result.has('pkg1')).toBe(true);
+      expect(result.has('pkg2')).toBe(true);
+      expect(result.has('pkg3')).toBe(true);
+    });
+
+    it('should parse packages array multiline', () => {
+      const content = `
+setup(
+    packages=[
+        "pkg1",
+        "pkg2",
+    ],
+)
+`;
+      const result = parseSetupPy(content);
+      expect(result.has('pkg1')).toBe(true);
+      expect(result.has('pkg2')).toBe(true);
+    });
+
+    it('should parse packages with single quotes', () => {
+      const content = `
+packages=['pkg1', 'pkg2']
+`;
+      const result = parseSetupPy(content);
+      expect(result.has('pkg1')).toBe(true);
+      expect(result.has('pkg2')).toBe(true);
+    });
+  });
+
+  describe('combined parsing', () => {
+    it('should parse both name and packages', () => {
+      const content = `
+from setuptools import setup
+
+setup(
+    name="main-package",
+    version="1.0.0",
+    packages=["subpkg1", "subpkg2"],
+)
+`;
+      const result = parseSetupPy(content);
+      expect(result.has('main-package')).toBe(true);
+      expect(result.has('main_package')).toBe(true);
+      expect(result.has('subpkg1')).toBe(true);
+      expect(result.has('subpkg2')).toBe(true);
+    });
+
+    it('should handle real-world setup.py', () => {
+      const content = `
+#!/usr/bin/env python
+from setuptools import setup, find_packages
+
+setup(
+    name="my-awesome-lib",
+    version="2.0.0",
+    author="Developer",
+    author_email="dev@example.com",
+    description="An awesome library",
+    packages=find_packages(),
+    python_requires=">=3.8",
+    install_requires=[
+        "numpy>=1.0",
+        "pandas>=1.0",
+    ],
+)
+`;
+      const result = parseSetupPy(content);
+      expect(result.has('my-awesome-lib')).toBe(true);
+      expect(result.has('my_awesome_lib')).toBe(true);
+    });
+  });
+
+  describe('edge cases', () => {
+    it('should return empty set for empty content', () => {
+      const result = parseSetupPy('');
+      expect(result.size).toBe(0);
+    });
+
+    it('should return empty set for content with find_packages() only', () => {
+      const content = `
+setup(
+    packages=find_packages(),
+)
+`;
+      const result = parseSetupPy(content);
+      // find_packages() is dynamic, not a literal array
+      expect(result.size).toBe(0);
+    });
+
+    it('should handle whitespace variations', () => {
+      const content = `
+setup(name  =  "my-pkg",packages  =  ["pkg1"])
+`;
+      const result = parseSetupPy(content);
+      expect(result.has('my-pkg')).toBe(true);
+      expect(result.has('pkg1')).toBe(true);
+    });
+  });
+});

package/src/index.ts

@@ -2,10 +2,12 @@ import {
   JupyterFrontEnd,
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
+import { PageConfig, URLExt } from '@jupyterlab/coreutils';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { IDefaultFileBrowser } from '@jupyterlab/filebrowser';
 import { LabIcon } from '@jupyterlab/ui-components';
 import { getIconSVG } from './icons';
+import { parsePyprojectToml, parseSetupPy } from './parsers';
 
 const PLUGIN_ID = 'jupyterlab_vscode_icons_extension:plugin';
 
@@ -17,6 +19,7 @@ interface IIconSettings {
   enableConfigIcons: boolean;
   enableDocIcons: boolean;
   enableImageIcons: boolean;
+  enableExecutableIcons: boolean;
 }
 
 /**
@@ -156,7 +159,7 @@ const fileTypeConfigs: IFileTypeConfig[] = [
     iconName: 'file-type-perl',
     group: 'enableLanguageIcons'
   },
-  // Shell scripts (.sh, .bash, .zsh) and batch files (.bat, .cmd) use custom icons with black backgrounds
+  // Shell scripts (.sh, .bash, .zsh, .fish, .csh, .nu) and batch files (.bat, .cmd) use custom icons with black backgrounds
   // Registered separately below with custom SVGs
   {
     extensions: ['.ps1'],
@@ -494,6 +497,13 @@ const plugin: JupyterFrontEndPlugin<void> = {
       const pythonPackageSvg =
         '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><defs><linearGradient id="ppa" x1="0%" y1="0%" x2="100%" y2="100%"><stop offset="0" stop-color="#387eb8"/><stop offset="1" stop-color="#366994"/></linearGradient><linearGradient id="ppb" x1="0%" y1="0%" x2="100%" y2="100%"><stop offset="0" stop-color="#ffe052"/><stop offset="1" stop-color="#ffc331"/></linearGradient></defs><g transform="scale(-1,1) translate(-32,0)"><path d="M27.4,5.5H18.1L16,9.7H4.3V26.5H29.5V5.5Zm0,4.2H19.2l1.1-2.1h7.1Z" fill="#58af7b"/><path d="M20.9,11c-5.1,0-4.8,2.2-4.8,2.2v2.3H21v.7H14.2S11,15.8,11,21s2.9,5,2.9,5h1.7V23.6a2.7,2.7,0,0,1,2.8-2.9h4.8a2.6,2.6,0,0,0,2.7-2.6V13.7S26.2,11,20.9,11Zm-2.7,1.5a.9.9,0,1,1-.8.9.9.9,0,0,1,.8-.9Z" fill="url(#ppa)"/><path d="M21.1,31c5.1,0,4.8-2.2,4.8-2.2V26.5H21v-.7h6.8S31,26.1,31,21s-2.9-5-2.9-5h-1.7v2.4a2.7,2.7,0,0,1-2.8,2.9H18.8a2.6,2.6,0,0,0-2.7,2.6v4.4S15.7,31,21,31Zm2.7-1.5a.9.9,0,1,1,.8-.9.9.9,0,0,1-.8.9Z" fill="url(#ppb)"/></g></svg>';
       const pythonPackageDataUri = `data:image/svg+xml;base64,${btoa(pythonPackageSvg)}`;
+      const venvSvg =
+        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><g transform="scale(-1,1) translate(-32,0)"><path d="M27.4,5.5H18.1L16,9.7H4.3V26.5H29.5V5.5Zm0,4.2H19.2l1.1-2.1h7.1Z" fill="#9575cd"/><g transform="translate(22,22) scale(1.25)" fill="#bababa"><path d="M-1.2,-6 L1.2,-6 L1.5,-4.5 L2.8,-4 L4,-5 L5.5,-3.5 L4.5,-2.3 L5,-1 L6.5,-0.8 L6.5,1.2 L5,1.5 L4.5,2.8 L5.5,4 L4,5.5 L2.8,4.5 L1.5,5 L1.2,6.5 L-1.2,6.5 L-1.5,5 L-2.8,4.5 L-4,5.5 L-5.5,4 L-4.5,2.8 L-5,1.5 L-6.5,1.2 L-6.5,-0.8 L-5,-1 L-4.5,-2.3 L-5.5,-3.5 L-4,-5 L-2.8,-4 L-1.5,-4.5 Z"/><circle cx="0" cy="0" r="2.5" fill="#9575cd"/></g></g></svg>';
+      const venvDataUri = `data:image/svg+xml;base64,${btoa(venvSvg)}`;
+      // Executable file icon - JupyterLab standard file icon with play triangle overlay
+      const executableSvg =
+        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path fill="#616161" d="m19.3 8.2-5.5-5.5c-.3-.3-.7-.5-1.2-.5H3.9c-.8.1-1.6.9-1.6 1.8v14.1c0 .9.7 1.6 1.6 1.6h14.2c.9 0 1.6-.7 1.6-1.6V9.4c.1-.5-.1-.9-.4-1.2m-5.8-3.3 3.4 3.6h-3.4zm3.9 12.7H4.7c-.1 0-.2 0-.2-.2V4.7c0-.2.1-.3.2-.3h7.2v4.4s0 .8.3 1.1 1.1.3 1.1.3h4.3v7.2s-.1.2-.2.2"/><path fill="#66bb6a" d="M12,12 L20,16 L12,20 Z"/></svg>';
+      const executableDataUri = `data:image/svg+xml;base64,${btoa(executableSvg)}`;
 
       // Inject CSS that overrides icons for .py and .md files
       // Note: Jupytext marks .py and .md files as type="notebook", so we need to
@@ -698,6 +708,38 @@ const plugin: JupyterFrontEndPlugin<void> = {
           background-repeat: no-repeat;
           background-position: center;
         }
+
+        /* Override venv folder icons (.venv, venv, .env, env) */
+        .jp-DirListing-item[data-venv-folder] .jp-DirListing-itemIcon svg,
+        .jp-DirListing-item[data-venv-folder] .jp-DirListing-itemIcon img {
+          display: none !important;
+        }
+        .jp-DirListing-item[data-venv-folder] .jp-DirListing-itemIcon::before {
+          content: '';
+          display: inline-block;
+          width: calc(var(--jp-ui-font-size1, 13px) * var(--jp-custom-icon-scale, 1.5));
+          height: calc(var(--jp-ui-font-size1, 13px) * var(--jp-custom-icon-scale, 1.5));
+          background-image: url('${venvDataUri}');
+          background-size: contain;
+          background-repeat: no-repeat;
+          background-position: center;
+        }
+
+        /* Override executable file icons */
+        .jp-DirListing-item[data-executable] .jp-DirListing-itemIcon svg,
+        .jp-DirListing-item[data-executable] .jp-DirListing-itemIcon img {
+          display: none !important;
+        }
+        .jp-DirListing-item[data-executable] .jp-DirListing-itemIcon::before {
+          content: '';
+          display: inline-block;
+          width: calc(var(--jp-ui-font-size1, 13px) * var(--jp-custom-icon-scale, 1.5));
+          height: calc(var(--jp-ui-font-size1, 13px) * var(--jp-custom-icon-scale, 1.5));
+          background-image: url('${executableDataUri}');
+          background-size: contain;
+          background-repeat: no-repeat;
+          background-position: center;
+        }
       `;
 
       // Add CSS to make JavaScript and .env icons less bright
@@ -721,78 +763,116 @@ const plugin: JupyterFrontEndPlugin<void> = {
         }
       `;
 
-      // Cache for Python package folder checks
-      const pythonPackageCache: Map<string, boolean> = new Map();
-
-      // Folders to exclude from Python package checking
-      const excludedFolderPatterns = [
-        /^\.git$/,
-        /^\.hg$/,
-        /^\.svn$/,
-        /^\.venv$/,
-        /^venv$/,
-        /^\.env$/,
-        /^env$/,
-        /^node_modules$/,
-        /^__pycache__$/,
-        /^\.ipynb_checkpoints$/,
-        /^\.pytest_cache$/,
-        /^\.mypy_cache$/,
-        /^\.ruff_cache$/,
-        /^\.tox$/,
-        /^\.nox$/,
-        /^\.coverage$/,
-        /^htmlcov$/,
-        /^dist$/,
-        /^build$/,
-        /^\.eggs$/,
-        /\.egg-info$/,
-        /\.dist-info$/
-      ];
-
-      const isExcludedFolder = (name: string): boolean => {
-        return excludedFolderPatterns.some(pattern => pattern.test(name));
-      };
+      // Cache for Python package detection (per directory)
+      let pythonPackagesCache: { path: string; packages: Set<string> } | null =
+        null;
+
+      // Detect Python packages by parsing pyproject.toml or setup.py
+      const detectPythonPackages = async (): Promise<Set<string>> => {
+        const currentPath = defaultFileBrowser?.model.path || '';
+
+        // Return cached result if same directory
+        if (pythonPackagesCache?.path === currentPath) {
+          return pythonPackagesCache.packages;
+        }
+
+        const packages = new Set<string>();
+
+        try {
+          const contents = await app.serviceManager.contents.get(currentPath, {
+            content: true
+          });
+          const files = contents.content || [];
 
-      // Check if a folder is a Python package (contains __init__.py)
-      // Use the file browser's model to get the correct path
-      const checkPythonPackage = async (
-        folderName: string
-      ): Promise<boolean> => {
-        // Skip excluded folders
-        if (isExcludedFolder(folderName)) {
-          return false;
+          // Check for pyproject.toml
+          const hasPyproject = files.some(
+            (f: any) => f.name === 'pyproject.toml'
+          );
+          if (hasPyproject) {
+            const pyprojectPath = currentPath
+              ? `${currentPath}/pyproject.toml`
+              : 'pyproject.toml';
+            const file = await app.serviceManager.contents.get(pyprojectPath);
+            const content = file.content as string;
+            const parsed = parsePyprojectToml(content);
+            parsed.forEach(p => packages.add(p));
+          }
+
+          // Check for setup.py
+          const hasSetupPy = files.some((f: any) => f.name === 'setup.py');
+          if (hasSetupPy) {
+            const setupPath = currentPath
+              ? `${currentPath}/setup.py`
+              : 'setup.py';
+            const file = await app.serviceManager.contents.get(setupPath);
+            const content = file.content as string;
+            const parsed = parseSetupPy(content);
+            parsed.forEach(p => packages.add(p));
+          }
+        } catch {
+          // Ignore errors - no packages detected
         }
 
-        // Get the current path from the file browser model
-        if (!defaultFileBrowser) {
-          return false;
+        pythonPackagesCache = { path: currentPath, packages };
+        return packages;
+      };
+
+      // Cache for executable file detection (per directory)
+      let executablesCache: { path: string; executables: Set<string> } | null =
+        null;
+
+      // Detect executable files via server API
+      const detectExecutables = async (): Promise<Set<string>> => {
+        if (!settings.enableExecutableIcons) {
+          return new Set<string>();
         }
-        const currentPath = defaultFileBrowser.model.path;
-        const fullPath = currentPath
-          ? `${currentPath}/${folderName}`
-          : folderName;
 
-        if (pythonPackageCache.has(fullPath)) {
-          return pythonPackageCache.get(fullPath)!;
+        const currentPath = defaultFileBrowser?.model.path || '';
+
+        // Return cached result if same directory
+        if (executablesCache?.path === currentPath) {
+          return executablesCache.executables;
         }
+
+        const executables = new Set<string>();
+
         try {
-          // Use JupyterLab's contents manager with the correct path from file browser
-          const contents = app.serviceManager.contents;
-          const model = await contents.get(fullPath, { content: true });
-          const hasInit =
-            model.content?.some((item: any) => item.name === '__init__.py') ||
-            false;
-          pythonPackageCache.set(fullPath, hasInit);
-          return hasInit;
+          const baseUrl = PageConfig.getBaseUrl();
+          const apiUrl = URLExt.join(
+            baseUrl,
+            'vscode-icons',
+            'executables'
+          );
+          const response = await fetch(
+            `${apiUrl}?path=${encodeURIComponent(currentPath)}`
+          );
+          if (response.ok) {
+            const files: string[] = await response.json();
+            files.forEach(f => executables.add(f));
+          }
         } catch {
-          pythonPackageCache.set(fullPath, false);
-          return false;
+          // Ignore errors - no executables detected
         }
+
+        executablesCache = { path: currentPath, executables };
+        return executables;
       };
 
+      // Invalidate cache on directory change
+      if (defaultFileBrowser) {
+        defaultFileBrowser.model.pathChanged.connect(() => {
+          pythonPackagesCache = null;
+          executablesCache = null;
+        });
+      }
+
       // Add a MutationObserver to mark special files in the file browser
-      const markSpecialFiles = () => {
+      const markSpecialFiles = async () => {
+        // Get Python packages for current directory (cached)
+        const pythonPackages = await detectPythonPackages();
+        // Get executable files for current directory (cached, only if setting enabled)
+        const executables = await detectExecutables();
+
         // Process ALL items - clear wrong attributes and set correct ones
         const allItems = document.querySelectorAll('.jp-DirListing-item');
         allItems.forEach(item => {
@@ -885,29 +965,49 @@ const plugin: JupyterFrontEndPlugin<void> = {
             item.setAttribute('data-pytest', 'true');
           }
 
+          // Mark executable files if setting is enabled (uses server API for +x detection)
+          item.removeAttribute('data-executable');
+          if (settings.enableExecutableIcons && executables.has(name)) {
+            item.setAttribute('data-executable', 'true');
+          }
+
           // Check if this is a directory (folder)
           const isDir =
             fileType === 'directory' ||
             item.classList.contains('jp-DirListing-directory');
           if (isDir) {
-            // Check if this folder is a Python package (async)
-            // Pass just the folder name - checkPythonPackage gets current path from file browser
-            checkPythonPackage(name).then(isPythonPackage => {
-              if (isPythonPackage) {
+            // Check if folder is a venv folder (.venv, venv, .env, env)
+            const venvNames = ['.venv', 'venv', '.env', 'env'];
+            if (venvNames.includes(nameLower)) {
+              item.setAttribute('data-venv-folder', 'true');
+              item.removeAttribute('data-python-package');
+            } else {
+              item.removeAttribute('data-venv-folder');
+              // Check if folder name matches a detected Python package
+              if (pythonPackages.has(name)) {
                 item.setAttribute('data-python-package', 'true');
               } else {
                 item.removeAttribute('data-python-package');
               }
-            });
+            }
           } else {
             item.removeAttribute('data-python-package');
+            item.removeAttribute('data-venv-folder');
           }
         });
       };
 
-      // Watch for changes in the file browser
+      // Debounce timeout for MutationObserver
+      let markSpecialFilesTimeout: ReturnType<typeof setTimeout> | null = null;
+
+      // Watch for changes in the file browser (debounced)
       const observer = new MutationObserver(() => {
-        markSpecialFiles();
+        if (markSpecialFilesTimeout) {
+          clearTimeout(markSpecialFilesTimeout);
+        }
+        markSpecialFilesTimeout = setTimeout(() => {
+          markSpecialFiles();
+        }, 100);
       });
 
       // Start observing when the file browser is ready
@@ -945,7 +1045,8 @@ const plugin: JupyterFrontEndPlugin<void> = {
       enableDataIcons: true,
       enableConfigIcons: true,
       enableDocIcons: true,
-      enableImageIcons: true
+      enableImageIcons: true,
+      enableExecutableIcons: false
     };
 
     // Function to register file types based on settings
@@ -1124,7 +1225,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
         docRegistry.addFileType({
           name: 'vscode-shell',
           displayName: 'Shell Script',
-          extensions: ['.sh', '.bash', '.zsh'],
+          extensions: ['.sh', '.bash', '.zsh', '.fish', '.csh', '.nu'],
           fileFormat: 'text',
           contentType: 'file',
           icon: shellIcon

package/src/parsers.ts

@@ -0,0 +1,57 @@
+/**
+ * Python package configuration file parsers
+ * Extracts package names from pyproject.toml and setup.py files
+ */
+
+/**
+ * Parse pyproject.toml content to extract Python package names
+ * @param content - The content of pyproject.toml file
+ * @returns Set of package names found in the file
+ */
+export function parsePyprojectToml(content: string): Set<string> {
+  const packages = new Set<string>();
+
+  // Parse [project] name = "package_name"
+  const nameMatch = content.match(
+    /\[project\][^[]*name\s*=\s*["']([^"']+)["']/s
+  );
+  if (nameMatch) {
+    packages.add(nameMatch[1]);
+    // Also add underscore variant (package-name -> package_name)
+    packages.add(nameMatch[1].replace(/-/g, '_'));
+  }
+
+  // Parse packages = ["pkg1", "pkg2"]
+  const packagesMatch = content.match(/packages\s*=\s*\[([^\]]+)\]/);
+  if (packagesMatch) {
+    const pkgList = packagesMatch[1].match(/["']([^"']+)["']/g);
+    pkgList?.forEach(p => packages.add(p.replace(/["']/g, '')));
+  }
+
+  return packages;
+}
+
+/**
+ * Parse setup.py content to extract Python package names
+ * @param content - The content of setup.py file
+ * @returns Set of package names found in the file
+ */
+export function parseSetupPy(content: string): Set<string> {
+  const packages = new Set<string>();
+
+  // Parse packages=["pkg1", "pkg2"]
+  const packagesMatch = content.match(/packages\s*=\s*\[([^\]]+)\]/);
+  if (packagesMatch) {
+    const pkgList = packagesMatch[1].match(/["']([^"']+)["']/g);
+    pkgList?.forEach(p => packages.add(p.replace(/["']/g, '')));
+  }
+
+  // Parse name="package_name"
+  const nameMatch = content.match(/name\s*=\s*["']([^"']+)["']/);
+  if (nameMatch) {
+    packages.add(nameMatch[1]);
+    packages.add(nameMatch[1].replace(/-/g, '_'));
+  }
+
+  return packages;
+}