vscode plugin shortcuts fix, comment whitespace fix (#356)

belous-dp · web-flow · commit 9f7edaaf129b · 2022-08-05T17:53:17.000+03:00
diff --git a/server/src/utils/Copyright.h b/server/src/utils/Copyright.h
@@ -8,13 +8,13 @@ namespace Copyright {
     static inline const std::string GENERATED_C_CPP_FILE_HEADER =
         "/*\n"
         " * This file is automatically generated by UnitTestBot. "
-        "For further information see"
+        "For further information see "
         PROJECT_HOMEPAGE_URL
         "\n */\n";
 
     static inline const std::string GENERATED_MAKEFILE_HEADER =
         "# This file is automatically generated by UnitTestBot. "
-        "For further information see"
+        "For further information see "
         PROJECT_HOMEPAGE_URL
         "\n";
 
diff --git a/vscode-plugin/package.json b/vscode-plugin/package.json
@@ -230,27 +230,27 @@
 			{
 				"command": "unittestbot.generateFileTests",
 				"key": "ctrl+t",
-				"when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c || editorLangId == cpp)"
+				"when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c|cpp)/"
 			},
 			{
 				"command": "unittestbot.generateProjectLineTests",
 				"key": "ctrl+alt+l",
-				"when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c || editorLangId == cpp)"
+				"when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c|cpp)/"
 			},
 			{
 				"command": "unittestbot.generatePredicateTests",
 				"key": "ctrl+alt+p",
-				"when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c || editorLangId == cpp)"
+				"when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c|cpp)/"
 			},
 			{
 				"command": "unittestbot.generateAssertionFailTests",
 				"key": "ctrl+alt+f",
-				"when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c || editorLangId == cpp)"
+				"when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c|cpp)/"
 			},
 			{
 				"command": "unittestbot.generateFunctionTests",
 				"key": "ctrl+alt+m",
-				"when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c || editorLangId == cpp)"
+				"when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c|cpp)/"
 			},
 			{
 				"command": "unittestbot.generateClassTests",
@@ -270,27 +270,27 @@
 			{
 				"command": "unittestbot.menucommand.generateFileTests",
 				"key": "ctrl+t",
-				"when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c || editorLangId == cpp)"
+				"when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c|cpp)/"
 			},
 			{
 				"command": "unittestbot.menucommand.generateProjectLineTests",
 				"key": "ctrl+alt+l",
-				"when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c || editorLangId == cpp)"
+				"when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c|cpp)/"
 			},
 			{
 				"command": "unittestbot.menucommand.generatePredicateTests",
 				"key": "ctrl+alt+p",
-				"when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c || editorLangId == cpp)"
+				"when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c|cpp)/"
 			},
 			{
 				"command": "unittestbot.menucommand.generateAssertionFailTests",
 				"key": "ctrl+alt+f",
-				"when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c || editorLangId == cpp)"
+				"when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c|cpp)/"
 			},
 			{
 				"command": "unittestbot.menucommand.generateFunctionTests",
 				"key": "ctrl+alt+m",
-				"when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c || editorLangId == cpp)"
+				"when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c|cpp)/"
 			},
 			{
 				"command": "unittestbot.menucommand.generateClassTests",
@@ -392,7 +392,7 @@
 			"unittestbot.utbot.editor.generate": [
 				{
 					"command": "unittestbot.menucommand.generateFileTests",
-					"when": "editorLangId == c || editorLangId == cpp",
+					"when": "editorLangId =~ /(c|cpp)/",
 					"group": "UTBot@1"
 				},
 				{
@@ -402,29 +402,29 @@
 				},
 				{
 					"command": "unittestbot.menucommand.generateFunctionTests",
-					"when": "editorLangId == c || editorLangId == cpp",
+					"when": "editorLangId =~ /(c|cpp)/",
 					"group": "UTBot@3"
 				},
 				{
 					"command": "unittestbot.menucommand.generateProjectLineTests",
-					"when": "editorLangId == c || editorLangId == cpp",
+					"when": "editorLangId =~ /(c|cpp)/",
 					"group": "UTBot@4"
 				},
 				{
 					"command": "unittestbot.menucommand.generateAssertionFailTests",
-					"when": "editorLangId == c || editorLangId == cpp",
+					"when": "editorLangId =~ /(c|cpp)/",
 					"group": "UTBot@5"
 				},
 				{
 					"command": "unittestbot.menucommand.generatePredicateTests",
-					"when": "editorLangId == c || editorLangId == cpp",
+					"when": "editorLangId =~ /(c|cpp)/",
 					"group": "UTBot@6"
 				}
 			],
 			"explorer/context": [
 				{
 					"command": "unittestbot.generateFileTests",
-					"when": "resourceLangId == c || resourceLangId == cpp",
+					"when": "resourceLangId =~ /(c|cpp)/",
 					"group": "UTBot@1"
 				},
 				{
@@ -443,7 +443,7 @@
 			"editor/context": [
 				{
 					"submenu": "unittestbot.utbot.editor.generate",
-					"when": "editorLangId == c || editorLangId == cpp",
+					"when": "editorLangId =~ /(c|cpp)/",
 					"group": "UTBot@1"
 				},
 				{

Original file line number	Diff line number	Diff line change
`@@ -230,27 +230,27 @@`
`230`	`230`	`{`
`231`	`231`	`"command": "unittestbot.generateFileTests",`
`232`	`232`	`"key": "ctrl+t",`
`233`		`- "when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c \|\| editorLangId == cpp)"`
	`233`	`+ "when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c\|cpp)/"`
`234`	`234`	`},`
`235`	`235`	`{`
`236`	`236`	`"command": "unittestbot.generateProjectLineTests",`
`237`	`237`	`"key": "ctrl+alt+l",`
`238`		`- "when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c \|\| editorLangId == cpp)"`
	`238`	`+ "when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c\|cpp)/"`
`239`	`239`	`},`
`240`	`240`	`{`
`241`	`241`	`"command": "unittestbot.generatePredicateTests",`
`242`	`242`	`"key": "ctrl+alt+p",`
`243`		`- "when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c \|\| editorLangId == cpp)"`
	`243`	`+ "when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c\|cpp)/"`
`244`	`244`	`},`
`245`	`245`	`{`
`246`	`246`	`"command": "unittestbot.generateAssertionFailTests",`
`247`	`247`	`"key": "ctrl+alt+f",`
`248`		`- "when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c \|\| editorLangId == cpp)"`
	`248`	`+ "when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c\|cpp)/"`
`249`	`249`	`},`
`250`	`250`	`{`
`251`	`251`	`"command": "unittestbot.generateFunctionTests",`
`252`	`252`	`"key": "ctrl+alt+m",`
`253`		`- "when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c \|\| editorLangId == cpp)"`
	`253`	`+ "when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c\|cpp)/"`
`254`	`254`	`},`
`255`	`255`	`{`
`256`	`256`	`"command": "unittestbot.generateClassTests",`
`@@ -270,27 +270,27 @@`
`270`	`270`	`{`
`271`	`271`	`"command": "unittestbot.menucommand.generateFileTests",`
`272`	`272`	`"key": "ctrl+t",`
`273`		`- "when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c \|\| editorLangId == cpp)"`
	`273`	`+ "when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c\|cpp)/"`
`274`	`274`	`},`
`275`	`275`	`{`
`276`	`276`	`"command": "unittestbot.menucommand.generateProjectLineTests",`
`277`	`277`	`"key": "ctrl+alt+l",`
`278`		`- "when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c \|\| editorLangId == cpp)"`
	`278`	`+ "when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c\|cpp)/"`
`279`	`279`	`},`
`280`	`280`	`{`
`281`	`281`	`"command": "unittestbot.menucommand.generatePredicateTests",`
`282`	`282`	`"key": "ctrl+alt+p",`
`283`		`- "when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c \|\| editorLangId == cpp)"`
	`283`	`+ "when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c\|cpp)/"`
`284`	`284`	`},`
`285`	`285`	`{`
`286`	`286`	`"command": "unittestbot.menucommand.generateAssertionFailTests",`
`287`	`287`	`"key": "ctrl+alt+f",`
`288`		`- "when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c \|\| editorLangId == cpp)"`
	`288`	`+ "when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c\|cpp)/"`
`289`	`289`	`},`
`290`	`290`	`{`
`291`	`291`	`"command": "unittestbot.menucommand.generateFunctionTests",`
`292`	`292`	`"key": "ctrl+alt+m",`
`293`		`- "when": "config.unittestbot.advanced.enableDeveloperMode == true && (editorLangId == c \|\| editorLangId == cpp)"`
	`293`	`+ "when": "config.unittestbot.advanced.enableDeveloperMode == true && editorLangId =~ /(c\|cpp)/"`
`294`	`294`	`},`
`295`	`295`	`{`
`296`	`296`	`"command": "unittestbot.menucommand.generateClassTests",`
`@@ -392,7 +392,7 @@`
`392`	`392`	`"unittestbot.utbot.editor.generate": [`
`393`	`393`	`{`
`394`	`394`	`"command": "unittestbot.menucommand.generateFileTests",`
`395`		`- "when": "editorLangId == c \|\| editorLangId == cpp",`
	`395`	`+ "when": "editorLangId =~ /(c\|cpp)/",`
`396`	`396`	`"group": "UTBot@1"`
`397`	`397`	`},`
`398`	`398`	`{`
`@@ -402,29 +402,29 @@`
`402`	`402`	`},`
`403`	`403`	`{`
`404`	`404`	`"command": "unittestbot.menucommand.generateFunctionTests",`
`405`		`- "when": "editorLangId == c \|\| editorLangId == cpp",`
	`405`	`+ "when": "editorLangId =~ /(c\|cpp)/",`
`406`	`406`	`"group": "UTBot@3"`
`407`	`407`	`},`
`408`	`408`	`{`
`409`	`409`	`"command": "unittestbot.menucommand.generateProjectLineTests",`
`410`		`- "when": "editorLangId == c \|\| editorLangId == cpp",`
	`410`	`+ "when": "editorLangId =~ /(c\|cpp)/",`
`411`	`411`	`"group": "UTBot@4"`
`412`	`412`	`},`
`413`	`413`	`{`
`414`	`414`	`"command": "unittestbot.menucommand.generateAssertionFailTests",`
`415`		`- "when": "editorLangId == c \|\| editorLangId == cpp",`
	`415`	`+ "when": "editorLangId =~ /(c\|cpp)/",`
`416`	`416`	`"group": "UTBot@5"`
`417`	`417`	`},`
`418`	`418`	`{`
`419`	`419`	`"command": "unittestbot.menucommand.generatePredicateTests",`
`420`		`- "when": "editorLangId == c \|\| editorLangId == cpp",`
	`420`	`+ "when": "editorLangId =~ /(c\|cpp)/",`
`421`	`421`	`"group": "UTBot@6"`
`422`	`422`	`}`
`423`	`423`	`],`
`424`	`424`	`"explorer/context": [`
`425`	`425`	`{`
`426`	`426`	`"command": "unittestbot.generateFileTests",`
`427`		`- "when": "resourceLangId == c \|\| resourceLangId == cpp",`
	`427`	`+ "when": "resourceLangId =~ /(c\|cpp)/",`
`428`	`428`	`"group": "UTBot@1"`
`429`	`429`	`},`
`430`	`430`	`{`
`@@ -443,7 +443,7 @@`
`443`	`443`	`"editor/context": [`
`444`	`444`	`{`
`445`	`445`	`"submenu": "unittestbot.utbot.editor.generate",`
`446`		`- "when": "editorLangId == c \|\| editorLangId == cpp",`
	`446`	`+ "when": "editorLangId =~ /(c\|cpp)/",`
`447`	`447`	`"group": "UTBot@1"`
`448`	`448`	`},`
`449`	`449`	`{`