From 116dc8428c5f99f52acb0ec64a85fb64ca965b7d Mon Sep 17 00:00:00 2001 From: Francesco Moro Date: Sun, 18 Sep 2022 16:24:04 +0200 Subject: [PATCH] Fixes --- package.json | 11 +++++++++- src/extension.ts | 21 ++++++++++++++++--- ...ntroller.tmpl => basicrestcontroller.tmpl} | 4 ++-- templates/enum.tmpl | 2 +- templates/interface.tmpl | 2 +- ...apicontroller.tmpl => restcontroller.tmpl} | 0 templates/xunit.tmpl | 2 +- 7 files changed, 33 insertions(+), 9 deletions(-) rename templates/{basicapicontroller.tmpl => basicrestcontroller.tmpl} (93%) rename templates/{apicontroller.tmpl => restcontroller.tmpl} (100%) diff --git a/package.json b/package.json index e74f3a6..a1f9519 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "onCommand:csharpextensions.createClass", "onCommand:csharpextensions.createEnum", "onCommand:csharpextensions.createInterface", - "onCommand:csharpextensions.createRestController" + "onCommand:csharpextensions.createRestController", + "onCommand:csharpextensions.createBasicRestController" ], "main": "./dist/extension", "contributes": { @@ -57,6 +58,10 @@ "command": "csharpextensions.createRestController", "title": "Rest Controller" }, + { + "command": "csharpextensions.createBasicRestController", + "title": "Basic Rest Controller" + }, { "command": "csharpextensions.createXUnitTest", "title": "XUnit Test" @@ -80,6 +85,10 @@ "group": "10_mvc@1", "command": "csharpextensions.createRestController" }, + { + "group": "10_mvc@1", + "command": "csharpextensions.createBasicRestController" + }, { "group": "30_test@0", "command": "csharpextensions.createXUnitTest" diff --git a/src/extension.ts b/src/extension.ts index f38da6a..a4e1ee9 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -168,6 +168,13 @@ export class Extension { return this.currentVscodeExtension; } + /** + * The key will be the template filename + * + * @static + * @return {*} {Map} + * @memberof Extension + */ static getknownTemplates(): Map { if (this.knownTemplates) { return this.knownTemplates; @@ -178,13 +185,21 @@ export class Extension { .set('interface', new CSharpTemplate('Interface', 'createInterface')) .set('enum', new CSharpTemplate('Enum', 'createEnum')) .set( - 'apicontroller', - new CSharpTemplate('ApiController', 'createRestController', [ + 'restcontroller', + new CSharpTemplate('RestController', 'createRestController', [ 'Microsoft.AspNetCore.Mvc', 'Microsoft.Extensions.Logging', 'Microsoft.AspNetCore.Http', 'System', - 'System.Collections.Generic' + 'System.Collections.Generic', + ]) + ) + .set( + 'basicrestcontroller', + new CSharpTemplate('BasicRestController', 'createBasicRestController', [ + 'Microsoft.AspNetCore.Mvc', + 'Microsoft.Extensions.Logging', + 'Microsoft.AspNetCore.Http', ]) ) .set('xunit', new CSharpTemplate('XUnit', 'createXUnitTest', ['XUnit'])); diff --git a/templates/basicapicontroller.tmpl b/templates/basicrestcontroller.tmpl similarity index 93% rename from templates/basicapicontroller.tmpl rename to templates/basicrestcontroller.tmpl index fdcfd3b..a1b2b19 100644 --- a/templates/basicapicontroller.tmpl +++ b/templates/basicrestcontroller.tmpl @@ -1,6 +1,6 @@ ${namespaces}namespace ${namespace} { - [ApiController] + [ApiController] [Route("api/[controller]")] public sealed class ${classname} : ControllerBase { @@ -13,4 +13,4 @@ ${namespaces}namespace ${namespace} _logger = logger; } } -} +} \ No newline at end of file diff --git a/templates/enum.tmpl b/templates/enum.tmpl index e01904f..1abb76b 100644 --- a/templates/enum.tmpl +++ b/templates/enum.tmpl @@ -4,4 +4,4 @@ ${namespaces}namespace ${namespace} { ${cursor} } -} +} \ No newline at end of file diff --git a/templates/interface.tmpl b/templates/interface.tmpl index 7b22823..0ec530d 100644 --- a/templates/interface.tmpl +++ b/templates/interface.tmpl @@ -4,4 +4,4 @@ ${namespaces}namespace ${namespace} { ${cursor} } -} +} \ No newline at end of file diff --git a/templates/apicontroller.tmpl b/templates/restcontroller.tmpl similarity index 100% rename from templates/apicontroller.tmpl rename to templates/restcontroller.tmpl diff --git a/templates/xunit.tmpl b/templates/xunit.tmpl index 246ce33..6a240bd 100644 --- a/templates/xunit.tmpl +++ b/templates/xunit.tmpl @@ -8,4 +8,4 @@ ${namespaces}namespace ${namespace} Assert.True(true);${cursor} } } -} +} \ No newline at end of file