diff --git a/main.go b/main.go index cfa116a..95d81be 100644 --- a/main.go +++ b/main.go @@ -58,7 +58,7 @@ var ( func main() { flag.Usage = func() { - fmt.Fprintln(os.Stderr, helpText) + // fmt.Fprintln(os.Stderr, helpText) flag.PrintDefaults() } flag.Parse() @@ -217,9 +217,9 @@ func licenseHeader(path string, tmpl *template.Template, data *copyrightData) ([ lic, err = prefix(tmpl, data, "/*", " * ", " */") case ".js", ".mjs", ".cjs", ".jsx", ".tsx", ".css", ".scss", ".sass", ".tf", ".ts": lic, err = prefix(tmpl, data, "/**", " * ", " */") - case ".cc", ".cpp", ".cs", ".go", ".hh", ".hpp", ".java", ".m", ".mm", ".proto", ".rs", ".scala", ".swift", ".dart", ".groovy", ".kt", ".kts", ".v", ".sv": + case ".cc", ".cpp", ".cs", ".go", ".hh", ".hpp", ".java", ".m", ".mm", ".proto", ".rs", ".scala", ".swift", ".dart", ".groovy", ".kt", ".kts", ".v", ".sv", ".cfc": lic, err = prefix(tmpl, data, "", "// ", "") - case ".py", ".sh", ".yaml", ".yml", ".dockerfile", "dockerfile", ".rb", "gemfile", ".tcl", ".bzl": + case ".py", ".sh", ".yaml", ".yml", ".dockerfile", "dockerfile", ".rb", "gemfile", ".tcl", ".bzl", "makefile": lic, err = prefix(tmpl, data, "", "# ", "") case ".el", ".lisp": lic, err = prefix(tmpl, data, "", ";; ", "") @@ -227,7 +227,7 @@ func licenseHeader(path string, tmpl *template.Template, data *copyrightData) ([ lic, err = prefix(tmpl, data, "", "% ", "") case ".hs", ".sql", ".sdl": lic, err = prefix(tmpl, data, "", "-- ", "") - case ".html", ".xml", ".vue": + case ".html", ".xml", ".vue", ".cfml", ".cfm": lic, err = prefix(tmpl, data, "") case ".php": lic, err = prefix(tmpl, data, "", "// ", "") @@ -272,6 +272,7 @@ func hashBang(b []byte) []byte { // go generate: ^// Code generated .* DO NOT EDIT\.$ var goGenerated = regexp.MustCompile(`(?m)^.{1,2} Code generated .* DO NOT EDIT\.$`) + // cargo raze: ^DO NOT EDIT! Replaced on runs of cargo-raze$ var cargoRazeGenerated = regexp.MustCompile(`(?m)^DO NOT EDIT! Replaced on runs of cargo-raze$`) diff --git a/testdata/expected/Makefile b/testdata/expected/Makefile new file mode 100644 index 0000000..9f5052f --- /dev/null +++ b/testdata/expected/Makefile @@ -0,0 +1,16 @@ +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +hellowword: + @echo Hello world \ No newline at end of file diff --git a/testdata/expected/file.cfc b/testdata/expected/file.cfc new file mode 100644 index 0000000..171ae53 --- /dev/null +++ b/testdata/expected/file.cfc @@ -0,0 +1,29 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +component persistent="true" table="todo"{ + property name="id" fieldtype="id" generator="native"; + property name="title" ormtype="string"; + property name="updated" ormtype="timestamp"; + property name="completed" ormtype="timestamp"; + + public boolean function isComplete(){ + if (len(this.getCompleted()) GT 0 ){ + return true; + } + return false; + } + + +} \ No newline at end of file diff --git a/testdata/expected/file.cfml b/testdata/expected/file.cfml new file mode 100644 index 0000000..3a643a6 --- /dev/null +++ b/testdata/expected/file.cfml @@ -0,0 +1,17 @@ + + + \ No newline at end of file diff --git a/testdata/initial/Makefile b/testdata/initial/Makefile new file mode 100644 index 0000000..99633c0 --- /dev/null +++ b/testdata/initial/Makefile @@ -0,0 +1,2 @@ +hellowword: + @echo Hello world \ No newline at end of file diff --git a/testdata/initial/file.cfc b/testdata/initial/file.cfc new file mode 100644 index 0000000..5918760 --- /dev/null +++ b/testdata/initial/file.cfc @@ -0,0 +1,15 @@ +component persistent="true" table="todo"{ + property name="id" fieldtype="id" generator="native"; + property name="title" ormtype="string"; + property name="updated" ormtype="timestamp"; + property name="completed" ormtype="timestamp"; + + public boolean function isComplete(){ + if (len(this.getCompleted()) GT 0 ){ + return true; + } + return false; + } + + +} \ No newline at end of file diff --git a/testdata/initial/file.cfml b/testdata/initial/file.cfml new file mode 100644 index 0000000..d9974aa --- /dev/null +++ b/testdata/initial/file.cfml @@ -0,0 +1 @@ + \ No newline at end of file