Patch/v1.1.10

.editorconfig

@@ -13,6 +13,7 @@ indent_size = 4
 
 [*.md]
 trim_trailing_whitespace = false
+indent_style = space
 
 [*.yml]
 indent_style = space

CHANGELOG.md

@@ -4,6 +4,51 @@ All notable changes to this extension will be documented in this file.
 
 This Changelog uses the [Keep a Changelog](http://keepachangelog.com/) structure.
 
+## [1.1.10](https://github.com/yCodeTech/auto-comment-blocks/releases/tag/v1.1.10) - 2025-07-21
+
+#### Fixed:
+
+-   Fixes yCodeTech/auto-comment-blocks#6 and indirectly yCodeTech/auto-comment-blocks#7
+
+    VS Code's `vscode.extensions.all` API doesn't find any built-in extensions on the Windows-side when running in WSL. It only gets the WSL-installed extensions, which causes the extension not to work at all because the language configuration file is not found.
+
+    The workaround fix is to manually read the Windows extensions directories when running in WSL and merge them with the WSL-installed extensions.
+
+-   Fixed language support detection to properly respect disabled language settings.
+
+    Custom language configurations now correctly check if a language is disabled before applying support, preventing unwanted language activation.
+
+-   Fixed support for languages with multiple extension configuration files by merging their configurations instead of overwriting them, ensuring complete language support. Also improved language configuration merging by properly handling comment configurations.
+
+#### Added:
+
+-   Added the ability to get the all extensions directly from the directory on non-WSL systems (eg. Windows) because VS Code's `extensions.all` API only gets enabled extensions and doesn't include disabled ones, which could prevent language configs being found.
+
+    -   Removed `vscode.extensions.all` API call from `findAllLanguageConfigFilePaths` method in favour of getting the extensions directly from the directories.
+
+-   Added new dependencies:
+
+    -   `is-wsl` for detecting WSL environments.
+    -   `package-json-type` for TypeScript type definitions of package.json.
+
+-   Added macOS keybinding support (`cmd+shift+m`) for the Blade override comments command.
+
+#### Changed:
+
+-   Refactored extension architecture with improved separation of concerns.
+
+    Major code reorganisation including extraction of utility functions, centralised extension data management, and improved debugging capabilities.
+
+    -   Added new `ExtensionData` class to centralize extension metadata management.
+
+        This new class provides a clean interface for accessing extension details like ID, name, version, and various system paths, improving code organisation and maintainability.
+
+    -   Added new `utils.ts` file with shared utility functions.
+
+        Extracted common functionality into reusable utility functions including JSON file operations, regex reconstruction, array merging, and data conversion utilities.
+
+-   Updated debug logging to provide more comprehensive environment and configuration information. Enhanced diagnostic output now includes detailed extension paths for both WSL and native environments, making troubleshooting easier.
+
 ## [1.1.9](https://github.com/yCodeTech/auto-comment-blocks/releases/tag/v1.1.9) - 2025-07-12
 
 #### Fixed:

README.md

@@ -61,7 +61,12 @@ There are 3 conditions in which a language is officially supported:
 2. The language is not defined in the `skip-languages` config file; and
 3. The language config has either `lineComment` or `blockComment` keys defined.
 
-Most of the officially VScode-supported languages (as defined in the [docs](https://code.visualstudio.com/docs/languages/identifiers#_known-language-identifiers)) pass these conditions.
+Most of the officially VScode default languages (as defined in the [docs](https://code.visualstudio.com/docs/languages/identifiers#_known-language-identifiers)) pass these conditions.
+
+For a full list of auto-supported VScode default languages, please view the auto-generated definition files:
+
+-   [Multi-line languages](https://github.com/yCodeTech/auto-comment-blocks/blob/master/auto-generated-language-definitions/multi-line-languages.json)
+-   [Single-line languages](https://github.com/yCodeTech/auto-comment-blocks/blob/master/auto-generated-language-definitions/single-line-languages.json)
 
 ---
 
@@ -124,7 +129,7 @@ Use `/*!` in all file types that support the normal `/*` comments to start a QDo
 
 #### Normal comment blocks
 
-Using the normal comment block `/* */` either typing manually or the native VScode command "Toggle Block Comment" (`editor.action.blockComment`, native keybinding `shift + alt + a`), the block will have the same on enter functionality as described above.
+Using the normal comment block `/* */` either typing manually or the native VScode command "Toggle Block Comment" (`editor.action.blockComment`, native keybinding <kbd>shift + alt + a</kbd> (macOS: <kbd>shift + option + a</kbd>)), the block will have the same on enter functionality as described above.
 
 ![block-comments](https://raw.githubusercontent.com/yCodeTech/auto-comment-blocks/master/img/block-comments.gif)
 
@@ -156,18 +161,16 @@ Reload the extension after changing any settings.
 
 -   `auto-comment-blocks.multiLineStyleBlocks`: Add language IDs here to enable multi-line comment blocks support for that language, allowing unsupported languages to have comment completion. The default is `['blade', 'html']`"
 
--   `auto-comment-blocks.overrideDefaultLanguageMultiLineComments`: A key : value pairing of language IDs and the beginning portion of a multi-line comment style, to override the default comment style for the vscode "Toggle Block Comment" `editor.action.blockComment` command (native Keybinding `shift + alt + a`). eg. `{'php': '/*!'}`
+-   `auto-comment-blocks.overrideDefaultLanguageMultiLineComments`: A key : value pairing of language IDs and the beginning portion of a multi-line comment style, to override the default comment style for the vscode "Toggle Block Comment" `editor.action.blockComment` command (native Keybinding <kbd>shift + alt + a</kbd> (macOS: <kbd>shift + option + a</kbd>)). eg. `{'php': '/*!'}`
 
--   `auto-comment-blocks.bladeOverrideComments`: When enabled, Blade-style block comments will be used in Blade contexts. Ie. `{{--  --}}` comments will be used instead of the HTML `<!-- -->` comments. Keybinding to enable/disable, default `ctrl + shift + m`. If `blade` language ID is set in the disabledLanguages, then the HTML `<!-- -->` comments will be used.
+-   `auto-comment-blocks.bladeOverrideComments`: When enabled, Blade-style block comments will be used in Blade contexts. Ie. `{{--  --}}` comments will be used instead of the HTML `<!-- -->` comments. Keybinding to enable/disable, default <kbd>ctrl + shift + m</kbd> (macOS: <kbd>cmd + shift + m</kbd>). If `blade` language ID is set in the disabledLanguages, then the HTML `<!-- -->` comments will be used.
 
 ## Known Issues
 
 -   Sometimes multi-line completion/asterisk insertion doesn't work. The reason is still unknown. It may go away if you reload your workspace.
 
 -   Currently, VS Code only allows extensions to overwrite, instead of modify, existing language configurations. This means that this extension may clash with another extension that overwrites the same language configurations, causing one or both not to work. In that case, uninstalling this extension is the only option for now.
 
--   Doesn't work properly on Windows Linux WSL2. VScode API only finds language configs that are installed only on WSL2, and not also on Windows. That means all the normal built-in as well as 3rd party extensions won't have auto comment blocks support in WSL2. (Related issue: [#6](https://github.com/yCodeTech/auto-comment-blocks/issues/6))
-
 Please [report an issue](https://github.com/yCodeTech/auto-comment-blocks/issues/new) if you find any bugs, or have questions or feature requests.
 
 As of v1.1.7, debugging information is now logged to a dedicated `Auto Comment Blocks` Output channel. Please save the entire log to file using the `Save Output As` button in the Output's "3-dot menu", and attach the file to any new issue.

auto-generated-language-definitions/multi-line-languages.json

@@ -30,8 +30,5 @@
 		"typescript",
 		"typescriptreact"
 	],
-	"customSupportedLanguages": [
-		"blade",
-		"html"
-	]
+	"customSupportedLanguages": []
 }

auto-generated-language-definitions/single-line-languages.json

@@ -11,7 +11,6 @@
 			"git-commit",
 			"git-rebase",
 			"github-actions-workflow",
-			"http",
 			"ignore",
 			"julia",
 			"makefile",
@@ -58,7 +57,8 @@
 		],
 		";": [
 			"clojure",
-			"ini"
+			"ini",
+			"wat"
 		]
 	},
 	"customSupportedLanguages": {}

package.json

@@ -2,7 +2,7 @@
 	"name": "automatic-comment-blocks",
 	"displayName": "Automatic Comment Blocks",
 	"description": "Provides block comment completion for Javadoc-style multi-line comments and single-line comment blocks for most officially supported languages.",
-	"version": "1.1.9",
+	"version": "1.1.10",
 	"publisher": "ycodetech",
 	"homepage": "https://github.com/ycodetech/auto-comment-blocks",
 	"repository": {
@@ -71,13 +71,13 @@
 				"auto-comment-blocks.overrideDefaultLanguageMultiLineComments": {
 					"type": "object",
 					"default": {},
-					"markdownDescription": "A key : value pairing of language IDs and the beginning portion of a multi-line comment style, to override the default comment style for the vscode `command editor.action.blockComment` (native Keybinding `shift + alt + a`). eg. `{'php': '/*!'}`"
+					"markdownDescription": "A key : value pairing of language IDs and the beginning portion of a multi-line comment style, to override the default comment style for the vscode `command editor.action.blockComment` (native Keybinding `shift + alt + a` (macOS: `shift + option + a`)). eg. `{'php': '/*!'}`"
 				},
 				"auto-comment-blocks.bladeOverrideComments": {
 					"scope": "resource",
 					"type": "boolean",
 					"default": false,
-					"markdownDescription": "When enabled, Blade style block comments will be used in Blade contexts. Ie. `{{--  --}}` comments will be used instead of the HTML `<!-- -->` comments. Keybinding to enable/disable, default `ctrl + shift + m`. If `blade` language ID is set in the disabledLanguages, then the HTML `<!-- -->` comments will be used."
+					"markdownDescription": "When enabled, Blade style block comments will be used in Blade contexts. Ie. `{{--  --}}` comments will be used instead of the HTML `<!-- -->` comments. Keybinding to enable/disable, default `ctrl + shift + m` (macOS: `cmd + shift + m`). If `blade` language ID is set in the disabledLanguages, then the HTML `<!-- -->` comments will be used."
 				}
 			}
 		},
@@ -90,6 +90,7 @@
 			{
 				"command": "auto-comment-blocks.changeBladeMultiLineBlock",
 				"key": "ctrl+shift+m",
+				"mac": "cmd+shift+m",
 				"when": "editorTextFocus"
 			}
 		]
@@ -108,6 +109,8 @@
 		"typescript": "^5.7"
 	},
 	"dependencies": {
-		"jsonc-parser": "^3.3.1"
+		"is-wsl": "^3.1.0",
+		"jsonc-parser": "^3.3.1",
+		"package-json-type": "^1.0.3"
 	}
 }