fix: Correct spacing for optional properties

Author: Mqxx

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@loat-dev/lint-plugins",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "license": "./LICENSE",
   "exports": {
     "./colon_spacing": "./src/plugins/colon_spacing.ts",

src/plugins/colon_spacing.ts

@@ -1,5 +1,7 @@
 import { rangePadding } from '../range_padding.ts';
 
+const spaceBeforeColon = 1;
+
 /**
  * This plugin ensures consistent spacing before and after the colon for type definitions.
  */
@@ -9,13 +11,42 @@ const colonSpacing : Deno.lint.Plugin = {
     'before-colon': {
       create(context) : Deno.lint.LintVisitor {
         return {
-          TSTypeAnnotation(node) : void {
-            if (['FunctionDeclaration', 'FunctionExpression', 'TSPropertySignature', 'Identifier', 'PropertyDefinition'].includes(node.parent.type)) {
+          Identifier(node) : void {
+            if (node.typeAnnotation) {
+              const section : Deno.lint.Range = [node.range[1], node.typeAnnotation.range[0]]
+
+              // Text _ from "<name>___?__:<type>"
+              const text = context.sourceCode.getText(node.parent).substring(
+                node.range[1] - node.parent.range[0],
+                node.typeAnnotation.range[0] - node.parent.range[0]
+              )
+              
+              if (node.optional) {
+                // Index of ? from "<name>?__:<type>"
+                const textAfterOptionalIndex = text.search(/\?/) + 1
 
-              const index = context.sourceCode.getText(node.parent).substring(
+                section[0] += textAfterOptionalIndex
+              }
+
+              if (section[1] - section[0] !== spaceBeforeColon) {
+                context.report({
+                  message: `Wrong colon spacing. Expected ${spaceBeforeColon} space before colon.`,
+                  range: rangePadding(section),
+                  fix(fixer) : Deno.lint.Fix {
+                    return fixer.replaceTextRange(section, ' ');
+                  }
+                });
+              }
+            }
+          },
+          TSTypeAnnotation(node) : void {
+            if (['FunctionDeclaration', 'FunctionExpression', 'TSPropertySignature', 'PropertyDefinition'].includes(node.parent.type)) {
+              const text = context.sourceCode.getText(node.parent).substring(
                 0,
                 node.range[0] - node.parent.range[0]
-              ).search(/(?:\)|.) *$/) + 1;
+              );
+
+              const index = text.search(/. *$/gm) + 1;
 
               const section : Deno.lint.Range = [
                 node.parent.range[0] + index,
@@ -111,3 +142,7 @@ const colonSpacing : Deno.lint.Plugin = {
 };
 
 export default colonSpacing;
+
+function _foo(_e? : string) : void {
+
+}