feat: parser cd

Author: fcying

.tasks

@@ -3,7 +3,7 @@
 command=go run ./cmd/compiledb/main.go -v -c --full-path < ./tests/build.log
 cwd=$(VIM_ROOT)
 output=terminal
-close=1
+close=0
 
 [release]
 command=go install ./cmd/compiledb && GOOS=windows go install ./cmd/compiledb && mv ~/go/bin/windows_amd64/compiledb.exe ~/workspace/go/bin

internal/parser.go

@@ -20,6 +20,7 @@ var RegexCompile string = `^.*-?(gcc|clang|cc|g\+\+|c\+\+|clang\+\+)-?.*(\.exe)?
 var RegexFile string = `^.*\s-c.*\s(.*\.(c|cpp|cc|cxx|c\+\+|s|m|mm|cu))(\s.*$|$)`
 
 // Internal variables used to parse build log entries
+var cd_regex = regexp.MustCompile(`^.*cd\s(.*?)\s(;|&|\|)`)
 var sh_regex = regexp.MustCompile(`^.*(;|&&|&|\|)`)
 var compile_regex *regexp.Regexp
 var file_regex *regexp.Regexp
@@ -71,11 +72,13 @@ func commandProcess(line string, workingDir string) ([]string, string) {
 
 func Parse(buildLog []string) {
 	var (
-		err           error
-		workingDir    string
-		exclude_regex *regexp.Regexp
-		cmdCnt        = 0
-		result        []Command
+		err              error
+		workingDir       = ""
+		backupWorkingDir = ""
+		exclude_regex    *regexp.Regexp
+		cmdCnt           = 0
+		result           []Command
+		matchGroup       []string
 	)
 
 	// check workingDir
@@ -94,7 +97,7 @@ func Parse(buildLog []string) {
 
 	dirStack := []string{workingDir}
 
-	//init regex
+	// init regex
 	if ParseConfig.Exclude != "" {
 		exclude_regex, err = regexp.Compile(ParseConfig.Exclude)
 		if err != nil {
@@ -117,6 +120,13 @@ func Parse(buildLog []string) {
 		line = strings.TrimSpace(line)
 		log.Debug("New command:", line)
 
+		// Restore workingDir
+		if backupWorkingDir != "" {
+			workingDir = backupWorkingDir
+			backupWorkingDir = ""
+			log.Infof("Restore workingDir: %s", workingDir)
+		}
+
 		// Parse directory that make entering/leaving
 		if make_enter_dir.MatchString(line) {
 			group := make_enter_dir.FindStringSubmatch(line)
@@ -138,6 +148,19 @@ func Parse(buildLog []string) {
 			continue
 		}
 
+		// Parse cd xx
+		matchGroup = cd_regex.FindStringSubmatch(line)
+		if matchGroup != nil {
+			backupWorkingDir = workingDir
+			cdPath := matchGroup[1]
+			if IsAbsPath(cdPath) == false {
+				workingDir = workingDir + "/" + cdPath
+			} else {
+				workingDir = cdPath
+			}
+			log.Infof("Temporarily change workingDir: %s", workingDir)
+		}
+
 		if checking_make.MatchString(line) {
 			continue
 		}

tests/build.log

@@ -22,3 +22,6 @@ make: Leaving directory '/opt/compiledb_test/src'
 make[1]: Entering directory `/opt/compiledb_test/src2"
 
 gcc -c ../fullpath.c
+
+cd ../ && gcc -c fullpath.c
+cd /opt/compiledb_test/ && gcc -c fullpath.c