fix: Spacing

Author: Mqxx

deno.json

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

src/plugins/colon_spacing.test.ts

@@ -7,7 +7,7 @@ Deno.test('colon-spacing plugin', async (test) => {
       colonSpacing,
       'main.ts',
       `
-      export function Foo(arg1: string, arg2: number): string { 
+      export function Foo(): string { 
         return 'Hello World!';
       }
       `
@@ -19,15 +19,15 @@ Deno.test('colon-spacing plugin', async (test) => {
 
     assertEquals(diagnostic.id, 'colon-spacing/before-colon');
     assertEquals(diagnostic.message, 'Wrong colon spacing. Expected 1 space before colon.');
-    assertEquals(diagnostic.fix, [{range: [54, 54], text: ' '}]);
+    assertEquals(diagnostic.fix, [{range: [28, 28], text: ' '}]);
   });
 
   await test.step('before-colon rule, too many spaces', () => {
     const diagnostics = Deno.lint.runPlugin(
       colonSpacing,
       'main.ts',
       `
-      export function Foo(arg1: string, arg2: number)  : string { 
+      export function Foo()  : string { 
         return 'Hello World!';
       }
       `
@@ -39,15 +39,15 @@ Deno.test('colon-spacing plugin', async (test) => {
 
     assertEquals(diagnostic.id, 'colon-spacing/before-colon');
     assertEquals(diagnostic.message, 'Wrong colon spacing. Expected 1 space before colon.');
-    assertEquals(diagnostic.fix, [{range: [54, 56], text: ' '}]);
+    assertEquals(diagnostic.fix, [{range: [28, 30], text: ' '}]);
   });
 
   await test.step('after-colon rule, no space', () => {
     const diagnostics = Deno.lint.runPlugin(
       colonSpacing,
       'main.ts',
       `
-      export function Foo(prop1: string, prop2: number) :string {
+      export function Foo() :string {
         return 'Hello World!';
       }
       `
@@ -59,15 +59,15 @@ Deno.test('colon-spacing plugin', async (test) => {
 
     assertEquals(diagnostic.id, 'colon-spacing/after-colon');
     assertEquals(diagnostic.message, 'Wrong colon spacing. Expected 1 space after colon.');
-    assertEquals(diagnostic.fix, [{range: [58, 58], text: ' '}]);
+    assertEquals(diagnostic.fix, [{range: [30, 30], text: ' '}]);
   });
 
   await test.step('after-colon rule, too many spaces', () => {
     const diagnostics = Deno.lint.runPlugin(
       colonSpacing,
       'main.ts',
       `
-      export function Foo(prop1: string, prop2: number) :  string {
+      export function Foo() :  string {
         return 'Hello World!';
       }
       `
@@ -79,15 +79,15 @@ Deno.test('colon-spacing plugin', async (test) => {
 
     assertEquals(diagnostic.id, 'colon-spacing/after-colon');
     assertEquals(diagnostic.message, 'Wrong colon spacing. Expected 1 space after colon.');
-    assertEquals(diagnostic.fix, [{range: [58, 60], text: ' '}]);
+    assertEquals(diagnostic.fix, [{range: [30, 32], text: ' '}]);
   });
 
   await test.step('before-colon/after-colon rule, no space, both', () => {
     const diagnostics = Deno.lint.runPlugin(
       colonSpacing,
       'main.ts',
       `
-      export function Foo(prop1: string, prop2: number):string {
+      export function Foo():string {
         return 'Hello World!';
       }
       `
@@ -100,11 +100,11 @@ Deno.test('colon-spacing plugin', async (test) => {
 
     assertEquals(afterFunctionDiagnostic.id, 'colon-spacing/before-colon');
     assertEquals(afterFunctionDiagnostic.message, 'Wrong colon spacing. Expected 1 space before colon.');
-    assertEquals(afterFunctionDiagnostic.fix, [{range: [56, 56], text: ' '}]);
+    assertEquals(afterFunctionDiagnostic.fix, [{range: [28, 28], text: ' '}]);
 
     assertEquals(beforeTypeDiagnostic.id, 'colon-spacing/after-colon');
     assertEquals(beforeTypeDiagnostic.message, 'Wrong colon spacing. Expected 1 space after colon.');
-    assertEquals(beforeTypeDiagnostic.fix, [{range: [57, 57], text: ' '}]);
+    assertEquals(beforeTypeDiagnostic.fix, [{range: [29, 29], text: ' '}]);
   });
 
   await test.step('before-colon rule, no space', () => {

src/plugins/colon_spacing.ts

@@ -8,7 +8,7 @@ const colonSpacing : Deno.lint.Plugin = {
       create(context) : Deno.lint.LintVisitor {
         return {
           TSTypeAnnotation(node) : void {
-            if (['FunctionDeclaration', 'FunctionExpression', 'TSPropertySignature'].includes(node.parent.type)) {
+            if (['FunctionDeclaration', 'FunctionExpression', 'TSPropertySignature', 'Identifier'].includes(node.parent.type)) {
               const functionStart = node.parent.range[0];
               const sectionEnd = node.range[0];
               const index =
@@ -33,7 +33,7 @@ const colonSpacing : Deno.lint.Plugin = {
       create(context) : Deno.lint.LintVisitor {
         return {
           TSTypeAnnotation(node) : void {
-            if (['FunctionDeclaration', 'FunctionExpression', 'TSPropertySignature'].includes(node.parent.type)) {
+            if (['FunctionDeclaration', 'FunctionExpression', 'TSPropertySignature', 'Identifier'].includes(node.parent.type)) {
               const sectionStart = node.range[0] + 1;
               const sectionEnd = node.typeAnnotation.range[0];