Merge pull request #16 from ViTeXFTW/dev/syntax/ViTeXFTW

Fixed formatter error

.github/workflows/deploy.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '20.x'
 
       # Step 3: Install dependencies
       - name: Install dependencies
@@ -33,9 +33,9 @@ jobs:
 
       # Step 5: Package and publish the extension
       - name: Publish VSCode Extension
+        uses: lannonbr/[email protected]
+        with:
+          args: "publish -p $VSCE_TOKEN"
         env:
           VSCE_TOKEN: ${{ secrets.VSCE_TOKEN }}
-        run: |
-          npx vsce package  # This packages the extension
-          npx vsce publish  # This publishes the extension
 

client/package.json

@@ -17,6 +17,9 @@
 	"engines": {
 		"vscode": "^1.85.0"
 	},
+	"activationEvents": [
+		"onLanguage:ini"
+	],
 	"scripts": {
 		"compile-test": "tsc -p tsconfig.test.json"
 	},

package.json

@@ -2,7 +2,7 @@
 	"name": "zerosyntax-server",
 	"displayName": "ZeroSyntax-Server",
 	"description": "Language server for Generals Zero Hour INI files",
-	"icon": "./images/icon.png",
+	"icon": "images/icon.png",
 	"version": "0.1.2",
 	"publisher": "ViTeXFTW",
 	"author": {
@@ -29,6 +29,17 @@
 	],
 	"main": "./client/out/extension",
 	"contributes": {
+		"languages": [
+			{
+				"id": "ini",
+				"aliases": ["Ini", "INI"],
+				"extensions": [
+					".ini",
+					".Ini",
+					".INI"
+				]
+			}
+		],
 		"viewsContainers": {
 			"activitybar": [
 				{

server/src/server.ts

@@ -74,6 +74,7 @@ connection.onInitialize((params: InitializeParams) => {
 	const result: InitializeResult = {
 		capabilities: {
 			textDocumentSync: TextDocumentSyncKind.Full,
+			documentFormattingProvider: true,
 			// Tell the client that this server supports code completion.
 			// definitionProvider: false, //true
 			// hoverProvider: false, //true
@@ -113,16 +114,6 @@ connection.onInitialized(() => {
 
 	connection.client.register(DocumentFormattingRequest.type)
 
-	connection.onDocumentFormatting((_edits) => {
-		const document = documents.get(_edits.textDocument.uri)
-		if (!document) {
-			console.log(`Document not found.`)
-			return null
-		}
-
-		return formatDocument(document, _edits.options.tabSize)
-	})
-
 	connection.client.register(DidChangeConfigurationNotification.type)
 
 	if (hasConfigurationCapability) {
@@ -140,6 +131,16 @@ connection.onInitialized(() => {
 	}
 });
 
+connection.onDocumentFormatting((_edits) => {
+	const document = documents.get(_edits.textDocument.uri)
+	if (!document) {
+		console.log(`Document not found.`)
+		return null
+	}
+
+	return formatDocument(document, _edits.options.tabSize)
+})
+
 // connection.onDidOpenTextDocument((params: DidOpenTextDocumentParams) => {
 // 	const document = params.textDocument.text
 // 	documents.set(params.textDocument.uri, params.textDocument.text)