mirror of
				https://github.com/jesseduffield/lazygit.git
				synced 2025-10-30 23:57:43 +02:00 
			
		
		
		
	remove sentinel errors
This commit is contained in:
		| @@ -341,11 +341,5 @@ func (gui *Gui) surfaceError(err error) error { | ||||
| 		return nil | ||||
| 	} | ||||
|  | ||||
| 	for _, sentinelError := range gui.sentinelErrorsArr() { | ||||
| 		if err == sentinelError { | ||||
| 			return err | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	return gui.createErrorPanel(err.Error()) | ||||
| } | ||||
|   | ||||
| @@ -1,33 +1,3 @@ | ||||
| package gui | ||||
|  | ||||
| import "github.com/go-errors/errors" | ||||
|  | ||||
| // SentinelErrors are the errors that have special meaning and need to be checked | ||||
| // by calling functions. The less of these, the better | ||||
| type SentinelErrors struct { | ||||
| 	ErrNoFiles error | ||||
| } | ||||
|  | ||||
| const UNKNOWN_VIEW_ERROR_MSG = "unknown view" | ||||
|  | ||||
| // GenerateSentinelErrors makes the sentinel errors for the gui. We're defining it here | ||||
| // because we can't do package-scoped errors with localization, and also because | ||||
| // it seems like package-scoped variables are bad in general | ||||
| // https://dave.cheney.net/2017/06/11/go-without-package-scoped-variables | ||||
| // In the future it would be good to implement some of the recommendations of | ||||
| // that article. For now, if we don't need an error to be a sentinel, we will just | ||||
| // define it inline. This has implications for error messages that pop up everywhere | ||||
| // in that we'll be duplicating the default values. We may need to look at | ||||
| // having a default localisation bundle defined, and just using keys-only when | ||||
| // localising things in the code. | ||||
| func (gui *Gui) GenerateSentinelErrors() { | ||||
| 	gui.Errors = SentinelErrors{ | ||||
| 		ErrNoFiles: errors.New(gui.Tr.NoChangedFiles), | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (gui *Gui) sentinelErrorsArr() []error { | ||||
| 	return []error{ | ||||
| 		gui.Errors.ErrNoFiles, | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -77,7 +77,6 @@ type Gui struct { | ||||
| 	RepoStateMap         map[Repo]*guiState | ||||
| 	Config               config.AppConfigurer | ||||
| 	Tr                   *i18n.TranslationSet | ||||
| 	Errors               SentinelErrors | ||||
| 	Updater              *updates.Updater | ||||
| 	statusManager        *statusManager | ||||
| 	credentials          credentials | ||||
| @@ -432,8 +431,6 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *oscom | ||||
|  | ||||
| 	gui.watchFilesForChanges() | ||||
|  | ||||
| 	gui.GenerateSentinelErrors() | ||||
|  | ||||
| 	return gui, nil | ||||
| } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user