Skip to content

Commit c2c82d6

Browse files
authored
Merge pull request #510 from per1234/allow_sketch_leading_underscore
Allow leading underscore in sketch filenames
2 parents 9e9da3c + fa2d53e commit c2c82d6

File tree

9 files changed

+4
-2
lines changed

9 files changed

+4
-2
lines changed

Diff for: internal/rule/rulefunction/rulefunction.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func brokenOutputList(list []string) string {
105105

106106
// validProjectPathBaseName checks whether the provided library folder or sketch filename contains prohibited characters.
107107
func validProjectPathBaseName(name string) bool {
108-
baseNameRegexp := regexp.MustCompile("^[a-zA-Z0-9][a-zA-Z0-9_.-]*$")
108+
baseNameRegexp := regexp.MustCompile("^[a-zA-Z0-9_][a-zA-Z0-9_.-]*$")
109109
return baseNameRegexp.MatchString(name)
110110
}
111111

Diff for: internal/rule/rulefunction/sketch_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func TestSketchNameMismatch(t *testing.T) {
7575
func TestProhibitedCharactersInSketchFileName(t *testing.T) {
7676
testTables := []sketchRuleFunctionTestTable{
7777
{"Has prohibited characters", "ProhibitedCharactersInFileName", ruleresult.Fail, "^Prohibited CharactersInFileName.h$"},
78-
{"No prohibited characters", "Valid", ruleresult.Pass, ""},
78+
{"No prohibited characters", "AllowedCharactersInFilenames", ruleresult.Pass, ""},
7979
}
8080

8181
checkSketchRuleFunction(ProhibitedCharactersInSketchFileName, testTables, t)

Diff for: internal/rule/rulefunction/testdata/sketches/AllowedCharactersInFilenames/1LeadingNumber.ino

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
void setup() {}
2+
void loop() {}

Diff for: internal/rule/rulefunction/testdata/sketches/AllowedCharactersInFilenames/Contains-Hyphen.ino

Whitespace-only changes.

Diff for: internal/rule/rulefunction/testdata/sketches/AllowedCharactersInFilenames/Contains.Dot.ino

Whitespace-only changes.

Diff for: internal/rule/rulefunction/testdata/sketches/AllowedCharactersInFilenames/ContainsNumber1.ino

Whitespace-only changes.

Diff for: internal/rule/rulefunction/testdata/sketches/AllowedCharactersInFilenames/Contains_Underscore.ino

Whitespace-only changes.

Diff for: internal/rule/rulefunction/testdata/sketches/AllowedCharactersInFilenames/_LeadingUnderscore.ino

Whitespace-only changes.

0 commit comments

Comments
 (0)