Skip to content

Commit c97592d

Browse files
committed
rebase continue
2 parents ac2917b + dad8884 commit c97592d

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

cli-v2.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ func main() {
3131

3232
// All other commands require a configuration file
3333
if configErr != nil && len(os.Args) > 1 {
34-
<<<<<<< HEAD
35-
=======
36-
fmt.Println(configErr)
37-
>>>>>>> eb43f2e (Feature/improve ux (#50))
3834
fmt.Println("No configuration file was found, execute init command first.")
3935
return
4036
}

cmd/analyze.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,6 @@ func runPylintAnalysis(workDirectory string, pathsToCheck []string, outputFile s
226226
}
227227
}
228228

229-
func runDartAnalyzer(workDirectory string, pathsToCheck []string, outputFile string, outputFormat string) {
230-
dartanalyzer := config.Config.Tools()["dartanalyzer"]
231-
tools.RunDartAnalyzer(workDirectory, dartanalyzer, pathsToCheck, outputFile, outputFormat, apiToken, provider, owner, repository)
232-
}
233-
234229
var analyzeCmd = &cobra.Command{
235230
Use: "analyze",
236231
Short: "Runs all configured linters.",
@@ -303,6 +298,7 @@ var analyzeCmd = &cobra.Command{
303298
log.Printf("Running %s...\n", toolName)
304299
runTool(workDirectory, toolName, args, outputFile)
305300
}
301+
}
306302
},
307303
}
308304

tools/dartanalyzerRunner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func RunDartAnalyzer(workDirectory string, toolInfo *plugins.ToolInfo, files []s
6565
fmt.Printf("Error getting tools from Codacy: %v\n", err)
6666
return
6767
}
68-
if tool.Settings.UsesConfigurationFile {
68+
if tool.Settings.UsesConfigFile {
6969
fmt.Println("Codacy is expecting a config file, please add one to your project or change the tool settings")
7070
return
7171
}

0 commit comments

Comments
 (0)