More lint fixes that were missed due to VSCode config

Author: dpup

.golangci.yaml

@@ -237,7 +237,6 @@ linters:
   - forbidigo # forbids identifiers
   - funlen # tool for detection of long functions
   - gocheckcompilerdirectives # validates go compiler directive comments (//go:)
-  - gochecknoglobals # checks that no global variables exist
   - gochecknoinits # checks that no init functions are present in Go code
   - gochecksumtype # checks exhaustiveness on Go "sum types"
   - gocognit # computes and checks the cognitive complexity of functions
@@ -277,7 +276,6 @@ linters:
   - tenv # detects using os.Setenv instead of t.Setenv since Go1.17
   - testableexamples # checks if examples are testable (have an expected output)
   - testifylint # checks usage of github.com/stretchr/testify
-  - testpackage # makes you use a separate _test package
   - tparallel # detects inappropriate usage of t.Parallel() method in your Go test codes
   - unconvert # removes unnecessary type conversions
   - unparam # reports unused function parameters
@@ -286,6 +284,8 @@ linters:
   - whitespace # detects leading and trailing whitespace
 
   ## you may want to enable
+  # - gochecknoglobals # checks that no global variables exist
+  # - testpackage # makes you use a separate _test package
   #- protogetter # reports direct reads from proto message fields when getters should be used
   #- nestif # reports deeply nested if statements
   #- decorder # checks declaration order and count of types, constants, variables and functions
@@ -338,7 +338,7 @@ issues:
     linters: [godot]
   - source: "//noinspection"
     linters: [gocritic]
-  - path: "_test\\.go"
+  - path: "(_test\\.go)"
     linters:
     - bodyclose
     - dupl
@@ -347,3 +347,6 @@ issues:
     - gosec
     - noctx
     - wrapcheck
+
+  exclude-dirs:
+  - test

data/enum.go

@@ -2,7 +2,7 @@ package data
 
 // Enum is the data out to render Enums in a file
 // Enums that nested inside messages will be pulled out to the top level
-// Because the way it works in typescript
+// Because the way it works in typescript.
 type Enum struct {
 	// Name will be the package level unique name
 	// Nested names will concat with their parent messages so that it will remain unique

data/file.go

@@ -9,9 +9,10 @@ import (
 	"github.com/iancoleman/strcase"
 )
 
-// File store the information about rendering a file
+// File store the information about rendering a file.
 type File struct {
-	// Enums is a list of enums to render, due to the fact that there cannot be any enum defined nested in the class in Typescript.
+	// Enums is a list of enums to render, due to the fact that there cannot be
+	// any enum defined nested in the class in Typescript.
 	// All Enums will be rendered at the top level
 	Enums []*Enum
 	// Messages represents top level messages inside the file.
@@ -24,9 +25,12 @@ type File struct {
 	Name string
 	// TSFileName is the name of the output file
 	TSFileName string
-	// PackageNonScalarType stores the type inside the same packages within the file, which will be used to figure out external dependencies inside the same package (different files)
+	// PackageNonScalarType stores the type inside the same packages within the
+	// file, which will be used to figure out external dependencies inside the
+	// same package (different files)
 	PackageNonScalarType []Type
-	// Dependencies is a list of dependencies for the file, which will be rendered at the top of the file as import statements
+	// Dependencies is a list of dependencies for the file, which will be rendered
+	// at the top of the file as import statements
 	dependencies []*Dependency
 }
 
@@ -50,7 +54,7 @@ func (f *File) Dependencies() []*Dependency {
 	return out
 }
 
-// NeedsOneOfSupport indicates the file needs one of support type utilities
+// NeedsOneOfSupport indicates the file needs one of support type utilities.
 func (f *File) NeedsOneOfSupport() bool {
 	for _, m := range f.Messages {
 		if m.HasOneOfFields() {
@@ -71,7 +75,7 @@ func (f *File) NeedsStructPBSupport() bool {
 	return false
 }
 
-// TrackPackageNonScalarType tracks the supplied non scala type in the same package
+// TrackPackageNonScalarType tracks the supplied non scala type in the same package.
 func (f *File) TrackPackageNonScalarType(t Type) {
 	isNonScalarType := strings.Index(t.GetType().Type, ".") == 0
 	if isNonScalarType {
@@ -83,7 +87,7 @@ func (f *File) IsEmpty() bool {
 	return len(f.Enums) == 0 && len(f.Messages) == 0 && len(f.Services) == 0
 }
 
-// NewFile returns an initialised new file
+// NewFile returns an initialised new file.
 func NewFile() *File {
 	return &File{
 		dependencies:           make([]*Dependency, 0),
@@ -92,7 +96,6 @@ func NewFile() *File {
 		Services:               make([]*Service, 0),
 		ExternalDependingTypes: make([]string, 0),
 	}
-
 }
 
 // Dependency stores the information about dependencies.
@@ -117,23 +120,23 @@ func GetModuleName(packageName, fileName string) string {
 	return strcase.ToCamel(packageName) + strcase.ToCamel(name)
 }
 
-// GetTSFileName gets the typescript filename out of the proto file name
+// GetTSFileName gets the typescript filename out of the proto file name.
 func GetTSFileName(fileName string) string {
 	baseName := filepath.Base(fileName)
 	ext := filepath.Ext(fileName)
 	name := baseName[0 : len(baseName)-len(ext)]
 	return path.Join(filepath.Dir(fileName), name+".pb.ts")
 }
 
-// Type is an interface to get type out of field and method arguments
+// Type is an interface to get type out of field and method arguments.
 type Type interface {
 	// GetType returns some information of the type to aid the rendering
 	GetType() *TypeInfo
 	// SetExternal changes the external field inside the data structure
 	SetExternal(bool)
 }
 
-// TypeInfo stores some common type information for rendering
+// TypeInfo stores some common type information for rendering.
 type TypeInfo struct {
 	// Type
 	Type string

data/message.go

@@ -1,14 +1,14 @@
 package data
 
-// Message stores the rendering information about message
+// Message stores the rendering information about message.
 type Message struct {
 	// Nested shows whether this message is a nested message and needs to be exported
 	Nested bool
 	// Name is the name of the Message
 	Name string
 	// Message has been marked as deprecated
 	IsDeprecated bool
-	//FQType is the fully qualified type name for the message itself
+	// FQType is the fully qualified type name for the message itself
 	FQType string
 	// Enums is a list of NestedEnums inside
 	Enums []*NestedEnum
@@ -20,9 +20,11 @@ type Message struct {
 	OptionalFields []*Field
 	// Message is the nested messages defined inside the message
 	Messages []*Message
-	// OneOfFieldsGroups is the grouped list of one of fields with same index. so that renderer can render the clearing of other fields on set.
+	// OneOfFieldsGroups is the grouped list of one of fields with same index. so
+	// that renderer can render the clearing of other fields on set.
 	OneOfFieldsGroups map[int32][]*Field
-	// OneOfFieldNames is the names of one of fields with same index. so that renderer can render the clearing of other fields on set.
+	// OneOfFieldNames is the names of one of fields with same index. so that
+	// renderer can render the clearing of other fields on set.
 	OneOfFieldsNames map[int32]string
 }
 
@@ -47,7 +49,7 @@ func (m *Message) HasStructPBFields() bool {
 	return false
 }
 
-// NewMessage initialises and return a Message
+// NewMessage initialises and return a Message.
 func NewMessage() *Message {
 	return &Message{
 		Nested:            false,
@@ -60,7 +62,7 @@ func NewMessage() *Message {
 	}
 }
 
-// NestedEnum stores the information of enums defined inside a message
+// NestedEnum stores the information of enums defined inside a message.
 type NestedEnum struct {
 	// Name of the Enum inside the class, which will be identical to the name
 	// defined inside the message
@@ -75,7 +77,7 @@ type NestedEnum struct {
 	Type string
 }
 
-// Field stores the information about a field inside message
+// Field stores the information about a field inside message.
 type Field struct {
 	Name string
 	// Type will be similar to NestedEnum.Type. Where scalar type and types inside
@@ -100,7 +102,7 @@ type Field struct {
 	IsRepeated bool
 }
 
-// GetType returns some information of the type to aid the rendering
+// GetType returns some information of the type to aid the rendering.
 func (f *Field) GetType() *TypeInfo {
 	return &TypeInfo{
 		Type:       f.Type,
@@ -110,20 +112,20 @@ func (f *Field) GetType() *TypeInfo {
 	}
 }
 
-// SetExternal mutate the IsExternal attribute
+// SetExternal mutate the IsExternal attribute.
 func (f *Field) SetExternal(external bool) {
 	f.IsExternal = external
 }
 
-// MapEntryType is the generic entry type for both key and value
+// MapEntryType is the generic entry type for both key and value.
 type MapEntryType struct {
 	// Type of the map entry
 	Type string
 	// IsExternal indicates the field typeis external to its own package
 	IsExternal bool
 }
 
-// GetType returns the type information for the type entry
+// GetType returns the type information for the type entry.
 func (m *MapEntryType) GetType() *TypeInfo {
 	return &TypeInfo{
 		Type:       m.Type,
@@ -132,7 +134,7 @@ func (m *MapEntryType) GetType() *TypeInfo {
 	}
 }
 
-// SetExternal mutate the IsExternal attribute inside
+// SetExternal mutate the IsExternal attribute inside.
 func (m *MapEntryType) SetExternal(external bool) {
 	m.IsExternal = external
 }

data/service.go

@@ -1,17 +1,17 @@
 package data
 
-// Service is the data representation of Service in proto
+// Service is the data representation of Service in proto.
 type Service struct {
 	// Name is the name of the Service
 	Name string
 	// Methods is a list of methods data
 	Methods []*Method
 }
 
-// Services is an alias of Service array
+// Services is an alias of Service array.
 type Services []*Service
 
-// HasServerStreamingMethod indicates whether there is server side streaming calls inside any of the services
+// HasServerStreamingMethod indicates whether there is server side streaming calls inside any of the services.
 func (s Services) HasServerStreamingMethod() bool {
 	for _, service := range s {
 		for _, method := range service.Methods {
@@ -23,7 +23,7 @@ func (s Services) HasServerStreamingMethod() bool {
 	return false
 }
 
-// HasUnaryCallMethod indicates whether there is unary methods inside any of the services
+// HasUnaryCallMethod indicates whether there is unary methods inside any of the services.
 func (s Services) HasUnaryCallMethod() bool {
 	for _, service := range s {
 		for _, method := range service.Methods {
@@ -35,20 +35,20 @@ func (s Services) HasUnaryCallMethod() bool {
 	return false
 }
 
-// RequiresFetchModule returns whether the given services needs fetch module support
+// RequiresFetchModule returns whether the given services needs fetch module support.
 func (s Services) RequiresFetchModule() bool {
 	hasServices := len(s) > 0
 	return hasServices && (s.HasUnaryCallMethod() || s.HasServerStreamingMethod())
 }
 
-// NewService returns an initialised service
+// NewService returns an initialised service.
 func NewService() *Service {
 	return &Service{
 		Methods: make([]*Method, 0),
 	}
 }
 
-// Method represents the rpc calls in protobuf service
+// Method represents the rpc calls in protobuf service.
 type Method struct {
 	// Name is the name of the method
 	Name string
@@ -68,7 +68,7 @@ type Method struct {
 	HTTPRequestBody *string
 }
 
-// MethodArgument stores the type information about method argument
+// MethodArgument stores the type information about method argument.
 type MethodArgument struct {
 	// Type is the type of the argument
 	Type string
@@ -78,7 +78,7 @@ type MethodArgument struct {
 	IsRepeated bool
 }
 
-// GetType returns some information of the type to aid the rendering
+// GetType returns some information of the type to aid the rendering.
 func (m *MethodArgument) GetType() *TypeInfo {
 	return &TypeInfo{
 		Type:       m.Type,
@@ -87,7 +87,7 @@ func (m *MethodArgument) GetType() *TypeInfo {
 	}
 }
 
-// SetExternal mutates the IsExternal attribute of the type
+// SetExternal mutates the IsExternal attribute of the type.
 func (m *MethodArgument) SetExternal(external bool) {
 	m.IsExternal = external
 }