Find JSFiles in Import() and ImportDir(), not ImportPackage()

flimzy · flimzy · commit ec1ca4bd3333 · 2015-10-19T20:54:21.000+02:00
diff --git a/build/build.go b/build/build.go
@@ -48,7 +48,13 @@ func ImportDir(path string, mode build.ImportMode) (*PackageData, error) {
 	if err != nil {
 		return nil,err
 	}
-	return &PackageData{Package: pkg},nil
+
+	jsFiles, err := jsFilesFromDir(pkg.Dir)
+	if err != nil {
+		return nil,err
+	}
+
+	return &PackageData{Package: pkg, JSFiles: jsFiles}, nil
 }
 
 func Import(path string, mode build.ImportMode, installSuffix string, buildTags []string) (*PackageData, error) {
@@ -95,7 +101,12 @@ func Import(path string, mode build.ImportMode, installSuffix string, buildTags
 		}
 	}
 
-	return &PackageData{Package: pkg}, nil
+	jsFiles, err := jsFilesFromDir(pkg.Dir)
+	if err != nil {
+		return nil,err
+	}
+
+	return &PackageData{Package: pkg, JSFiles: jsFiles}, nil
 }
 
 // parse parses and returns all .go files of given pkg.
@@ -373,12 +384,6 @@ func (s *Session) ImportPackage(path string) (*compiler.Archive, error) {
 		return nil, err
 	}
 
-	jsFiles, err := jsFilesFromDir(pkg.Dir)
-	if err != nil {
-		return nil, err
-	}
-	pkg.JSFiles = jsFiles
-
 	if err := s.BuildPackage(pkg); err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,13 @@ func ImportDir(path string, mode build.ImportMode) (*PackageData, error) {`
`48`	`48`	`if err != nil {`
`49`	`49`	`return nil,err`
`50`	`50`	`}`
`51`		`- return &PackageData{Package: pkg},nil`
	`51`	`+`
	`52`	`+ jsFiles, err := jsFilesFromDir(pkg.Dir)`
	`53`	`+ if err != nil {`
	`54`	`+ return nil,err`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ return &PackageData{Package: pkg, JSFiles: jsFiles}, nil`
`52`	`58`	`}`
`53`	`59`
`54`	`60`	`func Import(path string, mode build.ImportMode, installSuffix string, buildTags []string) (*PackageData, error) {`
`@@ -95,7 +101,12 @@ func Import(path string, mode build.ImportMode, installSuffix string, buildTags`
`95`	`101`	`}`
`96`	`102`	`}`
`97`	`103`
`98`		`- return &PackageData{Package: pkg}, nil`
	`104`	`+ jsFiles, err := jsFilesFromDir(pkg.Dir)`
	`105`	`+ if err != nil {`
	`106`	`+ return nil,err`
	`107`	`+ }`
	`108`	`+`
	`109`	`+ return &PackageData{Package: pkg, JSFiles: jsFiles}, nil`
`99`	`110`	`}`
`100`	`111`
`101`	`112`	`// parse parses and returns all .go files of given pkg.`
`@@ -373,12 +384,6 @@ func (s Session) ImportPackage(path string) (compiler.Archive, error) {`
`373`	`384`	`return nil, err`
`374`	`385`	`}`
`375`	`386`
`376`		`- jsFiles, err := jsFilesFromDir(pkg.Dir)`
`377`		`- if err != nil {`
`378`		`- return nil, err`
`379`		`- }`
`380`		`- pkg.JSFiles = jsFiles`
`381`		`-`
`382`	`387`	`if err := s.BuildPackage(pkg); err != nil {`
`383`	`388`	`return nil, err`
`384`	`389`	`}`