Lint fix & tidy up

v2/internal/app/desktop.go

@@ -91,7 +91,7 @@ func (a *App) Run() error {
 	// Start the service bus
 	a.servicebus.Debug()
 	err = a.servicebus.Start()
-	if err == nil {
+	if err != nil {
 		return err
 	}
 
@@ -103,7 +103,7 @@ func (a *App) Run() error {
 	}
 	a.runtime = runtimesubsystem
 	err = a.runtime.Start()
-	if err == nil {
+	if err != nil {
 		return err
 	}
 
@@ -119,7 +119,7 @@ func (a *App) Run() error {
 	}
 	a.binding = bindingsubsystem
 	err = a.binding.Start()
-	if err == nil {
+	if err != nil {
 		return err
 	}
 
@@ -130,7 +130,7 @@ func (a *App) Run() error {
 	}
 	a.log = log
 	err = a.log.Start()
-	if err == nil {
+	if err != nil {
 		return err
 	}
 
@@ -141,7 +141,7 @@ func (a *App) Run() error {
 	}
 	a.dispatcher = dispatcher
 	err = dispatcher.Start()
-	if err == nil {
+	if err != nil {
 		return err
 	}
 
@@ -152,7 +152,7 @@ func (a *App) Run() error {
 	}
 	a.event = event
 	err = a.event.Start()
-	if err == nil {
+	if err != nil {
 		return err
 	}
 
@@ -180,7 +180,7 @@ func (a *App) Run() error {
 		}
 		a.menu = menusubsystem
 		err = a.menu.Start()
-		if err == nil {
+		if err != nil {
 			return err
 		}
 	}
@@ -194,7 +194,7 @@ func (a *App) Run() error {
 		}
 		a.tray = traysubsystem
 		err = a.tray.Start()
-		if err == nil {
+		if err != nil {
 			return err
 		}
 	}
@@ -206,7 +206,7 @@ func (a *App) Run() error {
 	}
 	a.call = call
 	err = a.call.Start()
-	if err == nil {
+	if err != nil {
 		return err
 	}
 
@@ -219,7 +219,7 @@ func (a *App) Run() error {
 	result := a.window.Run(dispatcher, bindingDump, a.debug)
 	a.logger.Trace("Ffenestri.Run() exited")
 	err = a.servicebus.Stop()
-	if err == nil {
+	if err != nil {
 		return err
 	}
 

v2/internal/templates/templates/svelte-mui/basic.tmpl.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/internal/templates/templates/svelte-mui/main.tmpl.go

@@ -1,15 +1,22 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
+	"log"
 )
 
 func main() {
 
 	// Create application with options
-	app := wails.CreateApp("{{.ProjectName}}", 1024, 768)
+	app, err := wails.CreateApp("{{.ProjectName}}", 1024, 768)
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	app.Bind(newBasic())
 
-	app.Run()
+	err = app.Run()
+	if err != nil {
+		log.Fatal(err)
+	}
 }

v2/internal/templates/templates/vanilla/basic.tmpl.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/internal/templates/templates/vanilla/main.tmpl.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 func main() {

v2/internal/templates/templates/vuetify2-basic/basic.tmpl.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/internal/templates/templates/vuetify2-basic/main.tmpl.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 func main() {

v2/pkg/commands/build/server.go

@@ -56,11 +56,11 @@ func (s *ServerBuilder) BuildBaseAssets(assets *html.AssetBundle) error {
 	// Fetch, update, and reinject index.html
 	index, err := db.Read("index.html")
 	if err != nil {
-		return fmt.Errorf(`Failed to locate "index.html"`)
+		return fmt.Errorf(`failed to locate "index.html"`)
 	}
 	splits := strings.Split(string(index), "</body>")
 	if len(splits) != 2 {
-		return fmt.Errorf("Unable to locate a </body> tag in your frontend/index.html")
+		return fmt.Errorf("unable to locate a </body> tag in your frontend/index.html")
 	}
 	injectScript := `<script defer src="/wails.js"></script><script defer src="/bindings.js"></script>`
 	result := []string{}

v2/pkg/parser/testproject/basic.go

@@ -5,7 +5,7 @@ import (
 
 	"testproject/mypackage"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct
@@ -56,11 +56,11 @@ func (b *Basic) Greet(name string) string {
 }
 
 // MultipleGreets returns greetings for the given name
-func (b *Basic) MultipleGreets(name string) []string {
+func (b *Basic) MultipleGreets(_ string) []string {
 	return []string{"hi", "hello", "croeso!"}
 }
 
 // RemovePerson Removes the given person
-func (b *Basic) RemovePerson(p *mypackage.Person) {
+func (b *Basic) RemovePerson(_ *mypackage.Person) {
 	// dummy
 }

v2/test/disable-resize/basic.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/test/disable-resize/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
 

v2/test/frameless/basic.go

@@ -1,9 +1,10 @@
 package main
 
+//goland:noinspection GoRedundantImportAlias
 import (
 	"fmt"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/test/frameless/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
 	"github.com/wailsapp/wails/v2/pkg/options/mac"
 )

v2/test/hidden/basic.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/test/hidden/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
 

v2/test/kitchensink/browser.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Browser struct

v2/test/kitchensink/dialog.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
 

v2/test/kitchensink/events.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Events struct

v2/test/kitchensink/frontend/src/pages/Dialog/Open/code.go

@@ -3,7 +3,7 @@ package main
 import (
 	"io/ioutil"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
 

v2/test/kitchensink/frontend/src/pages/Dialog/Save/code.go

@@ -3,7 +3,7 @@ package main
 import (
 	"io/ioutil"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
 

v2/test/kitchensink/frontend/src/pages/System/Platform/code.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 type MyStruct struct {

v2/test/kitchensink/frontend/src/pages/Window/Window/code.go

@@ -4,7 +4,7 @@ import (
 	"image"
 	"os"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/internal/runtime"
 )
 

v2/test/kitchensink/frontend/src/pages/browser/Browser/code.go

@@ -1,6 +1,6 @@
 package main
 
-import wails "github.com/wailsapp/wails/v2"
+import "github.com/wailsapp/wails/v2"
 
 type MyStruct struct {
 	runtime *wails.Runtime

v2/test/kitchensink/frontend/src/pages/events/Emit/code.go

@@ -3,7 +3,7 @@ package main
 import (
 	"io/ioutil"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 type MyStruct struct {

v2/test/kitchensink/frontend/src/pages/events/On/code.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 type MyStruct struct {

v2/test/kitchensink/frontend/src/pages/events/OnMultiple/code.go

@@ -1,6 +1,6 @@
 package main
 
-import wails "github.com/wailsapp/wails/v2"
+import "github.com/wailsapp/wails/v2"
 
 type MyStruct struct {
 	runtime *wails.Runtime

v2/test/kitchensink/frontend/src/pages/events/Once/code.go

@@ -1,6 +1,6 @@
 package main
 
-import wails "github.com/wailsapp/wails/v2"
+import "github.com/wailsapp/wails/v2"
 
 type MyStruct struct {
 	runtime *wails.Runtime

v2/test/kitchensink/frontend/src/pages/logging/Log/code.go

@@ -1,6 +1,6 @@
 package main
 
-import wails "github.com/wailsapp/wails/v2"
+import "github.com/wailsapp/wails/v2"
 
 type MyStruct struct {
 	runtime *wails.Runtime

v2/test/kitchensink/frontend/src/pages/logging/SetLogLevel/code.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/logger"
 )
 

v2/test/kitchensink/logger.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/logger"
 )
 

v2/test/kitchensink/main.go

@@ -11,7 +11,7 @@ import (
 func main() {
 
 	// Create application with options
-	app := wails.CreateAppWithOptions(&options.App{
+	app, err := wails.CreateAppWithOptions(&options.App{
 		Title:     "Kitchen Sink",
 		Width:     1024,
 		Height:    768,
@@ -28,6 +28,10 @@ func main() {
 		LogLevel: logger.TRACE,
 	})
 
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	app.Bind(&Events{})
 	app.Bind(&Logger{})
 	app.Bind(&Browser{})
@@ -36,7 +40,7 @@ func main() {
 	app.Bind(&Window{})
 	app.Bind(&Menu{})
 
-	err := app.Run()
+	err = app.Run()
 	if err != nil {
 		log.Fatal(err)
 	}

v2/test/kitchensink/system.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // System struct

v2/test/kitchensink/window.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Window struct

v2/test/minmax/basic.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/test/minmax/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
 

v2/test/runtime/calc.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 )
 
 // Calc is a calculator

v2/test/runtime/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
 	"github.com/wailsapp/wails/v2/pkg/options/mac"
 )

v2/test/runtime/runtime.go

@@ -3,7 +3,7 @@ package main
 import (
 	"time"
 
-	wails "github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
 

v2/wails.go

@@ -12,12 +12,12 @@ import (
 type Runtime = runtime.Runtime
 
 // CreateAppWithOptions creates an application based on the given config
-func CreateAppWithOptions(options *options.App) *app.App {
+func CreateAppWithOptions(options *options.App) (*app.App, error) {
 	return app.CreateApp(options)
 }
 
 // CreateApp creates an application based on the given title, width and height
-func CreateApp(title string, width int, height int) *app.App {
+func CreateApp(title string, width int, height int) (*app.App, error) {
 
 	options := &options.App{
 		Title:  title,