Icons now work with themes rather than acting as one

Author: SSlinky

client/src/extension.ts

@@ -39,7 +39,11 @@ export function activate(context: ExtensionContext) {
 	// Options to control the language client
 	const clientOptions: LanguageClientOptions = {
 		// Register the server for plain text documents
-		documentSelector: [{ scheme: 'file', language: 'vba' }],
+		documentSelector: [
+			{ scheme: 'file', language: 'vba-class' },
+			{ scheme: 'file', language: 'vba-module' },
+			{ scheme: 'file', language: 'vba-form' }
+		],
 		synchronize: {
 			// Notify the server about file changes to '.clientrc files contained in the workspace
 			fileEvents: workspace.createFileSystemWatcher('**/.clientrc')

package.json

@@ -16,8 +16,7 @@
 		"Programming Languages",
 		"Snippets",
 		"Linters",
-		"Formatters",
-		"Themes"
+		"Formatters"
 	],
 	"keywords": [
 		"multi-root ready"
@@ -30,23 +29,34 @@
 	"contributes": {
 		"languages": [
 			{
-				"id": "vba",
-				"aliases": [
-					"VBA"
-				],
-				"extensions": [
-					".bas",
-					".cls",
-					".frm"
-				],
-				"configuration": "./vba.language-configuration.json"
-			}
-		],
-		"iconThemes": [
+				"id": "vba-class",
+				"aliases": ["VBA"],
+				"extensions": [".cls"],
+				"configuration": "./vba.language-configuration.json",
+				"icon": {
+					"dark": "icons/vba_blue.svg",
+					"light": "icons/vba_blue.svg"
+				}
+			},
+			{
+				"id": "vba-module",
+				"aliases": ["VBA"],
+				"extensions": [".bas"],
+				"configuration": "./vba.language-configuration.json",
+				"icon": {
+					"dark": "icons/vba_orange.svg",
+					"light": "icons/vba_orange.svg"
+				}
+			},
 			{
-				"id": "vba-lsp",
-				"label": "VBA Icons",
-				"path": "icon-theme.json"
+				"id": "vba-form",
+				"aliases": ["VBA"],
+				"extensions": [".frm"],
+				"configuration": "./vba.language-configuration.json",
+				"icon": {
+					"dark": "icons/vba_green.svg",
+					"light": "icons/vba_green.svg"
+				}
 			}
 		],
 		"configurationDefaults": {
@@ -125,14 +135,32 @@
 		},
 		"grammars": [
 			{
-				"language": "vba",
+				"language": "vba-class",
+				"scopeName": "source.vba",
+				"path": "./client/out/vba.tmLanguage.json"
+			},
+			{
+				"language": "vba-module",
+				"scopeName": "source.vba",
+				"path": "./client/out/vba.tmLanguage.json"
+			},
+			{
+				"language": "vba-form",
 				"scopeName": "source.vba",
 				"path": "./client/out/vba.tmLanguage.json"
 			}
 		],
 		"snippets": [
 			{
-				"language": "vba",
+				"language": "vba-class",
+				"path": "./snippets/vba.json"
+			},
+			{
+				"language": "vba-module",
+				"path": "./snippets/vba.json"
+			},
+			{
+				"language": "vba-form",
 				"path": "./snippets/vba.json"
 			}
 		]