Skip to content

Ensure we infer the LSIF upload root when no value is supplied. #145

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
merged 6 commits into from
Mar 2, 2020
Merged

Ensure we infer the LSIF upload root when no value is supplied. #145

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3c3e37
Ensure we infer the root when no value is supplied.
efritz Feb 27, 2020
0745b28
WIP.
efritz Mar 2, 2020
cb28c38
WIP.
efritz Mar 2, 2020
a5e99a0
WIP.
efritz Mar 2, 2020
d365e5c
WIP.
efritz Mar 2, 2020
2b41427
WIP.
efritz Mar 2, 2020
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
17 changes: 14 additions & 3 deletions cmd/src/lsif_upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ import (
"github.com/mattn/go-isatty"
)

func isFlagSet(fs *flag.FlagSet, name string) bool {
var found bool
fs.Visit(func(f *flag.Flag) {
if f.Name == name {
found = true
}
})
return found
}

func init() {
usage := `
Examples:
Expand Down Expand Up @@ -91,7 +101,7 @@ Examples:
}
fmt.Println("File: " + *fileFlag)

if rootFlag == nil {
if !isFlagSet(flagSet, "root") {
checkError := func(err error) {
if err != nil {
fmt.Println(err)
Expand All @@ -110,15 +120,16 @@ Examples:
rel, err := filepath.Rel(strings.TrimSpace(string(topLevel)), absFile)
checkError(err)

*rootFlag = filepath.Dir(rel)
relDir := filepath.Dir(rel)
rootFlag = &relDir
}

*rootFlag = filepath.Clean(*rootFlag)
if strings.HasPrefix(*rootFlag, "..") {
fmt.Println("-root is outside the repository: " + *rootFlag)
os.Exit(1)
}
if *rootFlag == "." {
if *rootFlag == "." || *rootFlag == "/" {
*rootFlag = ""
}
fmt.Println("Root: " + *rootFlag)
Expand Down