Skip to content

Cut SpaceBeforeInlineComment values at the earlier marker #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
unknwon merged 1 commit into from
Nov 11, 2026
Merged

Cut SpaceBeforeInlineComment values at the earlier marker #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ini_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,19 @@ GITHUB = U;n;k;n;w;o;n
assert.Equal(t, "U#n#k#n#w#o#n", nameValue)
assert.Equal(t, "U;n;k;n;w;o;n", githubValue)
})
t.Run("cuts at the first spaced comment marker when the line has both", func(t *testing.T) {
f, err := LoadSources(
LoadOptions{AllowPythonMultilineValues: false, SpaceBeforeInlineComment: true},
[]byte("key = foo ; note # ticket\n"))
require.NoError(t, err)
assert.Equal(t, "foo", f.Section("").Key("key").String())

f, err = LoadSources(
LoadOptions{AllowPythonMultilineValues: false, SpaceBeforeInlineComment: true},
[]byte("key = foo # ticket ; note\n"))
require.NoError(t, err)
assert.Equal(t, "foo", f.Section("").Key("key").String())
})
})
})

Expand Down
19 changes: 15 additions & 4 deletions parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,22 @@ func (p *parser) readValue(in []byte, bufferSize int) (string, error) {
if !p.options.IgnoreInlineComment {
var i int
if p.options.SpaceBeforeInlineComment {
i = strings.Index(line, " #")
if i == -1 {
i = strings.Index(line, " ;")
// Cut at the earlier of " #" and " ;". Looking for " #" first
// and only then " ;" left a later " #" to hide an earlier " ;".
iHash := strings.Index(line, " #")
iSemi := strings.Index(line, " ;")
switch {
case iHash == -1:
i = iSemi
case iSemi == -1:
i = iHash
default:
if iHash < iSemi {
i = iHash
} else {
i = iSemi
}
}

} else {
i = strings.IndexAny(line, "#;")
}
Expand Down