Merge pull request #2323 from ActiveState/DX-1456

projectfile deprecation: Fix commented out lines being detected

Author: Naatan

pkg/projectfile/projectfile.go

@@ -49,7 +49,7 @@ var (
 	// CommitURLRe Regex used to validate commit info /commit/someUUID
 	CommitURLRe = regexp.MustCompile(urlCommitRegexStr)
 	// deprecatedRegex covers the deprecated fields in the project file
-	deprecatedRegex = regexp.MustCompile(`\s*(?:constraints|platforms|languages):`)
+	deprecatedRegex = regexp.MustCompile(`(?m)^\s*(?:constraints|platforms|languages):`)
 )
 
 type ErrorParseProject struct{ *locale.LocalizedError }

pkg/projectfile/projectfile_test.go

@@ -433,6 +433,11 @@ func Test_detectDeprecations(t *testing.T) {
 				locale.Tr("pjfile_deprecation_entry", "constraints", "0"),
 			},
 		},
+		{
+			"Constraints Commented Out",
+			`#constraints: 0`,
+			[]string{},
+		},
 		{
 			"Platforms",
 			`platforms: 0"`,
@@ -449,10 +454,10 @@ func Test_detectDeprecations(t *testing.T) {
 		},
 		{
 			"Mixed",
-			"foo: 0\nconstraints: 0\nbar: 0\nlanguages: 0, platforms: 0",
+			"foo: 0\nconstraints: 0\nbar: 0\nlanguages: 0\nplatforms: 0",
 			[]string{
-				locale.Tr("pjfile_deprecation_entry", "constraints", "6"),
-				locale.Tr("pjfile_deprecation_entry", "languages", "28"),
+				locale.Tr("pjfile_deprecation_entry", "constraints", "7"),
+				locale.Tr("pjfile_deprecation_entry", "languages", "29"),
 				locale.Tr("pjfile_deprecation_entry", "platforms", "42"),
 			},
 		},
@@ -466,9 +471,9 @@ languages:
     constraints:
         platform: Windows10Label,Linux64Label`,
 			[]string{
-				locale.Tr("pjfile_deprecation_entry", "platforms", "108"),
-				locale.Tr("pjfile_deprecation_entry", "languages", "142"),
-				locale.Tr("pjfile_deprecation_entry", "constraints", "166"),
+				locale.Tr("pjfile_deprecation_entry", "platforms", "109"),
+				locale.Tr("pjfile_deprecation_entry", "languages", "143"),
+				locale.Tr("pjfile_deprecation_entry", "constraints", "167"),
 			},
 		},
 		{