Merge branch 'main' into nat/flexLog

nturinski · web-flow · commit 6831c0909ae7 · 2024-04-26T14:18:43.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Change Log
 
 ## 1.14.2 - 2024-04-26
+
 ### Changed
 * [[4096]](https://github.com/microsoft/vscode-azurefunctions/pull/4096) Update initial launch.json for Python to use debugpy
 
diff --git a/package.json b/package.json
@@ -465,12 +465,12 @@
                 },
                 {
                     "command": "azureFunctions.startStreamingLogs",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /azFunc(Production|)(Slot|Flex)(?!s)(?!.*container)/",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /azFunc(Production|)Slot(?!s)(?!.*container)/",
                     "group": "4@1"
                 },
                 {
                     "command": "azureFunctions.stopStreamingLogs",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /azFunc(Production|)(Slot|Flex)(?!s)(?!.*container)/",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /azFunc(Production|)Slot(?!s)(?!.*container)/",
                     "group": "4@2"
                 },
                 {

Original file line number	Diff line number	Diff line change
`@@ -465,12 +465,12 @@`
`465`	`465`	`},`
`466`	`466`	`{`
`467`	`467`	`"command": "azureFunctions.startStreamingLogs",`
`468`		`- "when": "view =~ /(azureResourceGroups\|azureFocusView)/ && viewItem =~ /azFunc(Production\|)(Slot\|Flex)(?!s)(?!.*container)/",`
	`468`	`+ "when": "view =~ /(azureResourceGroups\|azureFocusView)/ && viewItem =~ /azFunc(Production\|)Slot(?!s)(?!.*container)/",`
`469`	`469`	`"group": "4@1"`
`470`	`470`	`},`
`471`	`471`	`{`
`472`	`472`	`"command": "azureFunctions.stopStreamingLogs",`
`473`		`- "when": "view =~ /(azureResourceGroups\|azureFocusView)/ && viewItem =~ /azFunc(Production\|)(Slot\|Flex)(?!s)(?!.*container)/",`
	`473`	`+ "when": "view =~ /(azureResourceGroups\|azureFocusView)/ && viewItem =~ /azFunc(Production\|)Slot(?!s)(?!.*container)/",`
`474`	`474`	`"group": "4@2"`
`475`	`475`	`},`
`476`	`476`	`{`