Tools/Addlicense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use block-style comments for java, scala, kotlin

Browse Source 
fixes #46
This commit is contained in:
Will Norris
2021-08-10 10:26:12 -07:00
parent 9cc7ec3e36
commit 2fe3ee9447
4 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main.go
View File

@@ -283,11 +283,11 @@ func licenseHeader(path string, tmpl *template.Template, data licenseData) ([]by
switch fileExtension(path) { switch fileExtension(path) {
default: default:
return nil, nil return nil, nil
case ".c", ".h", ".gv": case ".c", ".h", ".gv", ".java", ".scala", ".kt", ".kts":
lic, err = executeTemplate(tmpl, data, "/*", " * ", " */") lic, err = executeTemplate(tmpl, data, "/*", " * ", " */")
case ".js", ".mjs", ".cjs", ".jsx", ".tsx", ".css", ".scss", ".sass", ".tf", ".ts": case ".js", ".mjs", ".cjs", ".jsx", ".tsx", ".css", ".scss", ".sass", ".tf", ".ts":
lic, err = executeTemplate(tmpl, data, "/**", " * ", " */") lic, err = executeTemplate(tmpl, data, "/**", " * ", " */")
case ".cc", ".cpp", ".cs", ".go", ".hcl", ".hh", ".hpp", ".java", ".m", ".mm", ".proto", ".rs", ".scala", ".swift", ".dart", ".groovy", ".kt", ".kts", ".v", ".sv": case ".cc", ".cpp", ".cs", ".go", ".hcl", ".hh", ".hpp", ".m", ".mm", ".proto", ".rs", ".swift", ".dart", ".groovy", ".v", ".sv":
lic, err = executeTemplate(tmpl, data, "", "// ", "") lic, err = executeTemplate(tmpl, data, "", "// ", "")
case ".py", ".sh", ".yaml", ".yml", ".dockerfile", "dockerfile", ".rb", "gemfile", ".tcl", ".bzl": case ".py", ".sh", ".yaml", ".yml", ".dockerfile", "dockerfile", ".rb", "gemfile", ".tcl", ".bzl":
lic, err = executeTemplate(tmpl, data, "", "# ", "") lic, err = executeTemplate(tmpl, data, "", "# ", "")

6
main_test.go
View File

@@ -303,7 +303,7 @@ func TestLicenseHeader(t *testing.T) {
"", "",
}, },
{ {
[]string{"f.c", "f.h", "f.gv"}, []string{"f.c", "f.h", "f.gv", "f.java", "f.scala", "f.kt", "f.kts"},
"/*\n * HYS\n */\n\n", "/*\n * HYS\n */\n\n",
}, },
{ {
@@ -311,8 +311,8 @@ func TestLicenseHeader(t *testing.T) {
"/**\n * HYS\n */\n\n", "/**\n * HYS\n */\n\n",
}, },
{ {
[]string{"f.cc", "f.cpp", "f.cs", "f.go", "f.hcl", "f.hh", "f.hpp", "f.java", "f.m", "f.mm", "f.proto", []string{"f.cc", "f.cpp", "f.cs", "f.go", "f.hcl", "f.hh", "f.hpp", "f.m", "f.mm", "f.proto",
"f.rs", "f.scala", "f.swift", "f.dart", "f.groovy", "f.kt", "f.kts", "f.v", "f.sv", "f.php"}, "f.rs", "f.swift", "f.dart", "f.groovy", "f.v", "f.sv", "f.php"},
"// HYS\n\n", "// HYS\n\n",
}, },
{ {

28
testdata/expected/file.java vendored
View File

@@ -1,16 +1,18 @@
// Copyright 2018 Google LLC /*
// * 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. * Licensed under the Apache License, Version 2.0 (the "License");
// You may obtain a copy of the License at * 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 *
// * 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, * Unless required by applicable law or agreed to in writing, software
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * distributed under the License is distributed on an "AS IS" BASIS,
// See the License for the specific language governing permissions and * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// limitations under the License. * See the License for the specific language governing permissions and
* limitations under the License.
*/
public class HelloWorld { public class HelloWorld {

28
testdata/expected/file.scala vendored
View File

@@ -1,16 +1,18 @@
// Copyright 2018 Google LLC /*
// * 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. * Licensed under the Apache License, Version 2.0 (the "License");
// You may obtain a copy of the License at * 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 *
// * 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, * Unless required by applicable law or agreed to in writing, software
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * distributed under the License is distributed on an "AS IS" BASIS,
// See the License for the specific language governing permissions and * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// limitations under the License. * See the License for the specific language governing permissions and
* limitations under the License.
*/
object HelloWorld { object HelloWorld {
def main(args: Array[String]): Unit = { def main(args: Array[String]): Unit = {