qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 22:04:44 -07:00
Code Releases Activity

go/scanner: interpret //line directives sans filename sensibly

Browse Source 
A //line directive without a filename now denotes the same
filename as the previous line (as in C).
Previously it denoted the file's directory (!).

Fixes #7765

LGTM=gri
R=gri
CC=golang-codereviews
https://golang.org/cl/86990044
This commit is contained in:
Alan Donovan 2014-04-16 14:51:33 -04:00
parent a6d3cc2904
commit d079144190
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pkg/go/scanner/scanner.go
View File

@ -148,11 +148,17 @@ func (s *Scanner) interpretLineComment(text []byte) {
// get filename and line number, if any // get filename and line number, if any
if i := bytes.LastIndex(text, []byte{':'}); i > 0 { if i := bytes.LastIndex(text, []byte{':'}); i > 0 {
if line, err := strconv.Atoi(string(text[i+1:])); err == nil && line > 0 { if line, err := strconv.Atoi(string(text[i+1:])); err == nil && line > 0 {
// valid //line filename:line comment; // valid //line filename:line comment
filename := filepath.Clean(string(text[len(prefix):i])) filename := string(bytes.TrimSpace(text[len(prefix):i]))
if !filepath.IsAbs(filename) { if filename == "" {
// make filename relative to current directory // assume same file as for previous line
filename = filepath.Join(s.dir, filename) filename = s.file.Position(s.file.Pos(s.lineOffset)).Filename
} else {
filename = filepath.Clean(filename)
if !filepath.IsAbs(filename) {
// make filename relative to current directory
filename = filepath.Join(s.dir, filename)
}
} }
// update scanner position // update scanner position
s.file.AddLineInfo(s.lineOffset+len(text)+1, filename, line) // +len(text)+1 since comment applies to next line s.file.AddLineInfo(s.lineOffset+len(text)+1, filename, line) // +len(text)+1 since comment applies to next line

5
src/pkg/go/scanner/scanner_test.go
View File

@ -493,9 +493,10 @@ var segments = []segment{
{"\nline3 //line File1.go:100", filepath.Join("dir", "TestLineComments"), 3}, // bad line comment, ignored {"\nline3 //line File1.go:100", filepath.Join("dir", "TestLineComments"), 3}, // bad line comment, ignored
{"\nline4", filepath.Join("dir", "TestLineComments"), 4}, {"\nline4", filepath.Join("dir", "TestLineComments"), 4},
{"\n//line File1.go:100\n line100", filepath.Join("dir", "File1.go"), 100}, {"\n//line File1.go:100\n line100", filepath.Join("dir", "File1.go"), 100},
{"\n//line :42\n line1", "dir/File1.go", 42},
{"\n//line File2.go:200\n line200", filepath.Join("dir", "File2.go"), 200}, {"\n//line File2.go:200\n line200", filepath.Join("dir", "File2.go"), 200},
{"\n//line :1\n line1", "dir", 1}, {"\n//line \t :123\n line1", "dir/File2.go", 123},
{"\n//line foo:42\n line42", filepath.Join("dir", "foo"), 42}, {"\n//line foo\t:42\n line42", filepath.Join("dir", "foo"), 42},
{"\n //line foo:42\n line44", filepath.Join("dir", "foo"), 44}, // bad line comment, ignored {"\n //line foo:42\n line44", filepath.Join("dir", "foo"), 44}, // bad line comment, ignored
{"\n//line foo 42\n line46", filepath.Join("dir", "foo"), 46}, // bad line comment, ignored {"\n//line foo 42\n line46", filepath.Join("dir", "foo"), 46}, // bad line comment, ignored
{"\n//line foo:42 extra text\n line48", filepath.Join("dir", "foo"), 48}, // bad line comment, ignored {"\n//line foo:42 extra text\n line48", filepath.Join("dir", "foo"), 48}, // bad line comment, ignored