From 387c2f2b61d3003210e69502e37a6eb3637e2c5d Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Sun, 3 Nov 2024 19:05:25 +0100 Subject: [PATCH] refactor(server): Rename pass to fsck --- server/handlers/fstab/analyzer/analyzer.go | 2 +- .../handlers/fstab/analyzer/{pass.go => fsck.go} | 10 +++++----- .../fstab/analyzer/{pass_test.go => fsck_test.go} | 4 ++-- server/handlers/fstab/analyzer/values.go | 4 ++-- server/handlers/fstab/ast/fstab.go | 4 ++-- server/handlers/fstab/ast/fstab_fields.go | 14 +++++++------- server/handlers/fstab/ast/listener.go | 2 +- server/handlers/fstab/ast/parser.go | 2 +- server/handlers/fstab/ast/parser_test.go | 6 +++--- server/handlers/fstab/fields/{pass.go => fsck.go} | 2 +- server/handlers/fstab/handlers/completions.go | 6 +++--- server/handlers/fstab/handlers/hover.go | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) rename server/handlers/fstab/analyzer/{pass.go => fsck.go} (80%) rename server/handlers/fstab/analyzer/{pass_test.go => fsck_test.go} (94%) rename server/handlers/fstab/fields/{pass.go => fsck.go} (92%) diff --git a/server/handlers/fstab/analyzer/analyzer.go b/server/handlers/fstab/analyzer/analyzer.go index b6b08a6..77c9d98 100644 --- a/server/handlers/fstab/analyzer/analyzer.go +++ b/server/handlers/fstab/analyzer/analyzer.go @@ -30,7 +30,7 @@ func Analyze( return ctx.diagnostics } - analyzePassFields(ctx) + analyzeFSCKField(ctx) return ctx.diagnostics } diff --git a/server/handlers/fstab/analyzer/pass.go b/server/handlers/fstab/analyzer/fsck.go similarity index 80% rename from server/handlers/fstab/analyzer/pass.go rename to server/handlers/fstab/analyzer/fsck.go index 33b1174..112de2d 100644 --- a/server/handlers/fstab/analyzer/pass.go +++ b/server/handlers/fstab/analyzer/fsck.go @@ -9,7 +9,7 @@ import ( protocol "github.com/tliron/glsp/protocol_3_16" ) -func analyzePassFields(ctx *analyzerContext) { +func analyzeFSCKField(ctx *analyzerContext) { it := ctx.document.Config.Entries.Iterator() var rootEntry *ast.FstabEntry @@ -17,14 +17,14 @@ func analyzePassFields(ctx *analyzerContext) { for it.Next() { entry := it.Value().(*ast.FstabEntry) - if entry.Fields != nil && entry.Fields.Pass != nil && entry.Fields.Pass.Value.Value == "1" { + if entry.Fields != nil && entry.Fields.Fsck != nil && entry.Fields.Fsck.Value.Value == "1" { fileSystem := strings.ToLower(entry.Fields.FilesystemType.Value.Value) if fileSystem == "btrfs" || fileSystem == "xfs" { // From https://wiki.archlinux.org/title/Fstab ctx.diagnostics = append(ctx.diagnostics, protocol.Diagnostic{ - Range: entry.Fields.Pass.ToLSPRange(), + Range: entry.Fields.Fsck.ToLSPRange(), Message: "If the root file system is btrfs or XFS, the fsck order should be set to 0 instead of 1. See fsck.btrfs(8) and fsck.xfs(8).", Severity: &common.SeverityWarning, }) @@ -32,10 +32,10 @@ func analyzePassFields(ctx *analyzerContext) { continue } - if entry.Fields.Pass.Value.Value == "1" { + if entry.Fields.Fsck.Value.Value == "1" { if rootEntry != nil { ctx.diagnostics = append(ctx.diagnostics, protocol.Diagnostic{ - Range: entry.Fields.Pass.ToLSPRange(), + Range: entry.Fields.Fsck.ToLSPRange(), Message: fmt.Sprintf("Only the root file system should have a fsck of 1. Other file systems should have a fsck of 2 or 0. The root file system is already using a fsck=1 on line %d", rootEntry.Fields.Start.Line), Severity: &common.SeverityWarning, }) diff --git a/server/handlers/fstab/analyzer/pass_test.go b/server/handlers/fstab/analyzer/fsck_test.go similarity index 94% rename from server/handlers/fstab/analyzer/pass_test.go rename to server/handlers/fstab/analyzer/fsck_test.go index 74ef781..3e50ab0 100644 --- a/server/handlers/fstab/analyzer/pass_test.go +++ b/server/handlers/fstab/analyzer/fsck_test.go @@ -18,7 +18,7 @@ UUID=12345678-1234-1234-1234-123456789012 /home ext4 defaults 0 2 document: document, } - analyzePassFields(ctx) + analyzeFSCKField(ctx) if len(ctx.diagnostics) != 1 { t.Errorf("Expected 1 error, got %v", len(ctx.diagnostics)) @@ -36,7 +36,7 @@ UUID=12345678-1234-1234-1234-123456789012 /boot btrfs defaults 0 1 document: document, } - analyzePassFields(ctx) + analyzeFSCKField(ctx) if len(ctx.diagnostics) != 1 { t.Errorf("Expected 1 error, got %v", len(ctx.diagnostics)) diff --git a/server/handlers/fstab/analyzer/values.go b/server/handlers/fstab/analyzer/values.go index bd7d8ba..62d9fac 100644 --- a/server/handlers/fstab/analyzer/values.go +++ b/server/handlers/fstab/analyzer/values.go @@ -33,8 +33,8 @@ func analyzeValuesAreValid( checkField(ctx, entry.Fields.Freq, fields.FreqField) } - if entry.Fields.Pass != nil { - checkField(ctx, entry.Fields.Pass, fields.PassField) + if entry.Fields.Fsck != nil { + checkField(ctx, entry.Fields.Fsck, fields.FsckField) } } } diff --git a/server/handlers/fstab/ast/fstab.go b/server/handlers/fstab/ast/fstab.go index 8286ba0..8355956 100644 --- a/server/handlers/fstab/ast/fstab.go +++ b/server/handlers/fstab/ast/fstab.go @@ -14,7 +14,7 @@ const ( FstabFieldFileSystemType FstabFieldName = "filesystemtype" FstabFieldOptions FstabFieldName = "options" FstabFieldFreq FstabFieldName = "freq" - FstabFieldPass FstabFieldName = "pass" + FstabFieldFsck FstabFieldName = "fsck" ) type FstabField struct { @@ -29,7 +29,7 @@ type FstabFields struct { FilesystemType *FstabField Options *FstabField Freq *FstabField - Pass *FstabField + Fsck *FstabField } type FstabEntry struct { diff --git a/server/handlers/fstab/ast/fstab_fields.go b/server/handlers/fstab/ast/fstab_fields.go index 77679b5..19dff2a 100644 --- a/server/handlers/fstab/ast/fstab_fields.go +++ b/server/handlers/fstab/ast/fstab_fields.go @@ -20,7 +20,7 @@ import ( // LABEL=test ext4 defaults 0 0 func (e FstabEntry) GetFieldAtPosition(position common.Position) FstabFieldName { // No fields defined, empty line - if e.Fields.Spec == nil && e.Fields.MountPoint == nil && e.Fields.FilesystemType == nil && e.Fields.Options == nil && e.Fields.Freq == nil && e.Fields.Pass == nil { + if e.Fields.Spec == nil && e.Fields.MountPoint == nil && e.Fields.FilesystemType == nil && e.Fields.Options == nil && e.Fields.Freq == nil && e.Fields.Fsck == nil { return FstabFieldSpec } @@ -41,8 +41,8 @@ func (e FstabEntry) GetFieldAtPosition(position common.Position) FstabFieldName if e.Fields.Freq != nil && e.Fields.Freq.ContainsPosition(position) { return FstabFieldFreq } - if e.Fields.Pass != nil && e.Fields.Pass.ContainsPosition(position) { - return FstabFieldPass + if e.Fields.Fsck != nil && e.Fields.Fsck.ContainsPosition(position) { + return FstabFieldFsck } // Okay let's try to fetch the field by assuming the user is typing from left to right normally @@ -63,8 +63,8 @@ func (e FstabEntry) GetFieldAtPosition(position common.Position) FstabFieldName return FstabFieldFreq } - if e.Fields.Freq != nil && e.Fields.Freq.IsPositionAfterEnd(position) && (e.Fields.Pass == nil || e.Fields.Pass.IsPositionBeforeEnd(position)) { - return FstabFieldPass + if e.Fields.Freq != nil && e.Fields.Freq.IsPositionAfterEnd(position) && (e.Fields.Fsck == nil || e.Fields.Fsck.IsPositionBeforeEnd(position)) { + return FstabFieldFsck } // Okay shit no idea, let's just give whatever is missing @@ -89,7 +89,7 @@ func (e FstabEntry) GetFieldAtPosition(position common.Position) FstabFieldName return FstabFieldFreq } - return FstabFieldPass + return FstabFieldFsck } // LABEL=test /mnt/test btrfs subvol=backup,fat=32 [0] [0] @@ -122,7 +122,7 @@ func (e FstabEntry) getDefinedFieldsAmount() uint8 { if e.Fields.Freq != nil { definedAmount++ } - if e.Fields.Pass != nil { + if e.Fields.Fsck != nil { definedAmount++ } diff --git a/server/handlers/fstab/ast/listener.go b/server/handlers/fstab/ast/listener.go index a9f16b4..4cc4625 100644 --- a/server/handlers/fstab/ast/listener.go +++ b/server/handlers/fstab/ast/listener.go @@ -128,7 +128,7 @@ func (s *fstabParserListener) EnterPass(ctx *parser.PassContext) { text := ctx.GetText() value := commonparser.ParseRawString(text, commonparser.FullFeatures) - s.fstabContext.currentEntry.Fields.Pass = &FstabField{ + s.fstabContext.currentEntry.Fields.Fsck = &FstabField{ LocationRange: location, Value: value, } diff --git a/server/handlers/fstab/ast/parser.go b/server/handlers/fstab/ast/parser.go index f24a6fa..3d17a87 100644 --- a/server/handlers/fstab/ast/parser.go +++ b/server/handlers/fstab/ast/parser.go @@ -161,7 +161,7 @@ func (c *FstabConfig) parseStatement( // FilesystemType: filesystemType, // Options: options, // Freq: freq, -// Pass: pass, +// Fsck: pass, // }, // } // diff --git a/server/handlers/fstab/ast/parser_test.go b/server/handlers/fstab/ast/parser_test.go index ac37136..9d5abdb 100644 --- a/server/handlers/fstab/ast/parser_test.go +++ b/server/handlers/fstab/ast/parser_test.go @@ -27,7 +27,7 @@ LABEL=example /mnt/example fat32 defaults 0 2 rawFirstEntry, _ := c.Entries.Get(uint32(0)) firstEntry := rawFirstEntry.(*FstabEntry) - if !(firstEntry.Fields.Spec.Value.Value == "LABEL=test" && firstEntry.Fields.MountPoint.Value.Value == "/mnt/test" && firstEntry.Fields.FilesystemType.Value.Value == "ext4" && firstEntry.Fields.Options.Value.Value == "defaults" && firstEntry.Fields.Freq.Value.Value == "0" && firstEntry.Fields.Pass.Value.Value == "0") { + if !(firstEntry.Fields.Spec.Value.Value == "LABEL=test" && firstEntry.Fields.MountPoint.Value.Value == "/mnt/test" && firstEntry.Fields.FilesystemType.Value.Value == "ext4" && firstEntry.Fields.Options.Value.Value == "defaults" && firstEntry.Fields.Freq.Value.Value == "0" && firstEntry.Fields.Fsck.Value.Value == "0") { t.Fatalf("Expected entry to be LABEL=test /mnt/test ext4 defaults 0 0, got %v", firstEntry) } @@ -71,8 +71,8 @@ LABEL=example /mnt/example fat32 defaults 0 2 t.Errorf("Expected freq end to be 0:36, got %v", firstEntry.Fields.Freq.LocationRange.End) } - if !(firstEntry.Fields.Pass.LocationRange.Start.Line == 0 && firstEntry.Fields.Pass.LocationRange.Start.Character == 37) { - t.Errorf("Expected pass start to be 0:37, got %v", firstEntry.Fields.Pass.LocationRange.Start) + if !(firstEntry.Fields.Fsck.LocationRange.Start.Line == 0 && firstEntry.Fields.Fsck.LocationRange.Start.Character == 37) { + t.Errorf("Expected pass start to be 0:37, got %v", firstEntry.Fields.Fsck.LocationRange.Start) } field := firstEntry.GetFieldAtPosition(common.IndexPosition(0)) diff --git a/server/handlers/fstab/fields/pass.go b/server/handlers/fstab/fields/fsck.go similarity index 92% rename from server/handlers/fstab/fields/pass.go rename to server/handlers/fstab/fields/fsck.go index 8c61709..6093c10 100644 --- a/server/handlers/fstab/fields/pass.go +++ b/server/handlers/fstab/fields/fsck.go @@ -2,7 +2,7 @@ package fields import docvalues "config-lsp/doc-values" -var PassField = docvalues.EnumValue{ +var FsckField = docvalues.EnumValue{ EnforceValues: false, Values: []docvalues.EnumString{ docvalues.CreateEnumStringWithDoc( diff --git a/server/handlers/fstab/handlers/completions.go b/server/handlers/fstab/handlers/completions.go index c2d00f5..e899969 100644 --- a/server/handlers/fstab/handlers/completions.go +++ b/server/handlers/fstab/handlers/completions.go @@ -84,10 +84,10 @@ func GetCompletion( value, cursor, ), nil - case ast.FstabFieldPass: - value, cursor := getFieldSafely(entry.Fields.Pass, cursor) + case ast.FstabFieldFsck: + value, cursor := getFieldSafely(entry.Fields.Fsck, cursor) - return fields.PassField.DeprecatedFetchCompletions( + return fields.FsckField.DeprecatedFetchCompletions( value, cursor, ), nil diff --git a/server/handlers/fstab/handlers/hover.go b/server/handlers/fstab/handlers/hover.go index 0216a62..f825ffe 100644 --- a/server/handlers/fstab/handlers/hover.go +++ b/server/handlers/fstab/handlers/hover.go @@ -42,7 +42,7 @@ func GetHoverInfo( return &hover, nil case ast.FstabFieldFreq: return &FreqHoverField, nil - case ast.FstabFieldPass: + case ast.FstabFieldFsck: return &PassHoverField, nil }