Merge remote-tracking branch 'origin/main' into merogge/notebook-verbosity

Author: rebornix

.configurations/configuration.dsc.yaml

@@ -0,0 +1,67 @@
+# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
+# Reference: https://github.com/microsoft/vscode/wiki/How-to-Contribute
+properties:
+  resources:
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      directives:
+        description: Install Git
+        allowPrerelease: true
+      settings:
+        id: Git.Git
+        source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: npm
+      directives:
+        description: Install NodeJS version >=16.17.x and <17
+        allowPrerelease: true
+      settings:
+        id: OpenJS.NodeJS.LTS
+        version: "16.20.0"
+        source: winget
+    - resource: NpmDsc/NpmPackage
+      id: yarn
+      dependsOn:
+        - npm
+      directives:
+        description: Install Yarn
+        allowPrerelease: true
+      settings:
+        Name: 'yarn'
+        Global: true
+        PackageDirectory: '${WinGetConfigRoot}\..\'
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      directives:
+        description: Install Python 3.10
+        allowPrerelease: true
+      settings:
+        id: Python.Python.3.10
+        source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: vsPackage
+      directives:
+        description: Install Visual Studio 2022 (any edition is OK)
+        allowPrerelease: true
+      settings:
+        id: Microsoft.VisualStudio.2022.BuildTools
+        source: winget
+    - resource: Microsoft.VisualStudio.DSC/VSComponents
+      dependsOn:
+        - vsPackage
+      directives:
+        description: Install required VS workloads
+        allowPrerelease: true
+      settings:
+        productId: Microsoft.VisualStudio.Product.BuildTools
+        channelId: VisualStudio.17.Release
+        includeRecommended: true
+        components:
+          - Microsoft.VisualStudio.Workload.VCTools
+    - resource: YarnDsc/YarnInstall
+      dependsOn:
+        - npm
+      directives:
+        description: Install dependencies
+        allowPrerelease: true
+      settings:
+        PackageDirectory: '${WinGetConfigRoot}\..\'
+  configurationVersion: 0.2.0

ThirdPartyNotices.txt

@@ -1303,7 +1303,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-jlelong/vscode-latex-basics 1.5.1 - MIT
+jlelong/vscode-latex-basics 1.5.2 - MIT
 https://github.com/jlelong/vscode-latex-basics
 
 Copyright (c) vscode-latex-basics authors
@@ -1654,8 +1654,8 @@ THE SOFTWARE.
 
 ---------------------------------------------------------
 
-language-php 0.48.1 - MIT
-https://github.com/atom/language-php
+language-php 0.49.0 - MIT
+https://github.com/KapitanOczywisty/language-php
 
 The MIT License (MIT)
 
@@ -2184,7 +2184,7 @@ THE SOFTWARE.
 
 ---------------------------------------------------------
 
-microsoft/vscode-css 0.45.1 - MIT License
+microsoft/vscode-css 0.0.0 - MIT License
 https://github.com/microsoft/vscode-css
 
 MIT License
@@ -2748,7 +2748,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SO
 
 ---------------------------------------------------------
 
-trond-snekvik/vscode-rst 1.5.1 - MIT
+trond-snekvik/vscode-rst 1.5.2 - MIT
 https://github.com/trond-snekvik/vscode-rst
 
 The MIT License (MIT)

build/lib/i18n.resources.json

@@ -290,6 +290,10 @@
 			"name": "vs/workbench/contrib/welcomeWalkthrough",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/welcomeDialog",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/outline",
 			"project": "vscode-workbench"

build/lib/stylelint/vscode-known-variables.json

@@ -51,6 +51,8 @@
 		"--vscode-commandCenter-foreground",
 		"--vscode-commandCenter-inactiveBorder",
 		"--vscode-commandCenter-inactiveForeground",
+		"--vscode-commentsView-resolvedIcon",
+		"--vscode-commentsView-unresolvedIcon",
 		"--vscode-contrastActiveBorder",
 		"--vscode-contrastBorder",
 		"--vscode-debugConsole-errorForeground",
@@ -97,6 +99,7 @@
 		"--vscode-diffEditor-removedLineBackground",
 		"--vscode-diffEditor-removedTextBackground",
 		"--vscode-diffEditor-removedTextBorder",
+		"--vscode-diffEditor-unchangedRegionBackground",
 		"--vscode-diffEditorGutter-insertedLineBackground",
 		"--vscode-diffEditorGutter-removedLineBackground",
 		"--vscode-diffEditorOverview-insertedForeground",
@@ -233,6 +236,8 @@
 		"--vscode-editorOverviewRuler-background",
 		"--vscode-editorOverviewRuler-border",
 		"--vscode-editorOverviewRuler-bracketMatchForeground",
+		"--vscode-editorOverviewRuler-commentForeground",
+		"--vscode-editorOverviewRuler-commentUnresolvedForeground",
 		"--vscode-editorOverviewRuler-commonContentForeground",
 		"--vscode-editorOverviewRuler-currentContentForeground",
 		"--vscode-editorOverviewRuler-deletedForeground",
@@ -309,6 +314,8 @@
 		"--vscode-interactiveEditor-border",
 		"--vscode-interactiveEditor-regionHighlight",
 		"--vscode-interactiveEditor-shadow",
+		"--vscode-interactiveEditorDiff-inserted",
+		"--vscode-interactiveEditorDiff-removed",
 		"--vscode-interactiveEditorInput-background",
 		"--vscode-interactiveEditorInput-border",
 		"--vscode-interactiveEditorInput-focusBorder",
@@ -457,7 +464,6 @@
 		"--vscode-problemsErrorIcon-foreground",
 		"--vscode-problemsInfoIcon-foreground",
 		"--vscode-problemsWarningIcon-foreground",
-		"--vscode-problemsSuccessIcon-foreground",
 		"--vscode-profileBadge-background",
 		"--vscode-profileBadge-foreground",
 		"--vscode-progressBar-background",
@@ -520,6 +526,8 @@
 		"--vscode-statusBar-noFolderBackground",
 		"--vscode-statusBar-noFolderBorder",
 		"--vscode-statusBar-noFolderForeground",
+		"--vscode-statusBar-offlineBackground",
+		"--vscode-statusBar-offlineForeground",
 		"--vscode-statusBarItem-activeBackground",
 		"--vscode-statusBarItem-compactHoverBackground",
 		"--vscode-statusBarItem-errorBackground",
@@ -733,4 +741,4 @@
 		"--z-index-run-button-container",
 		"--zoom-factor"
 	]
-}
+}

cglicenses.json

@@ -342,5 +342,55 @@
 	{ // License is MIT/Apache and tool doesn't look in subfolders
 		"name": "dirs-sys-next",
 		"fullLicenseTextUri": "https://raw.githubusercontent.com/xdg-rs/dirs/master/dirs-sys/LICENSE-MIT"
+	},
+	{
+		"name": "https-proxy-agent",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"Copyright (c) 2013 Nathan Rajlich <[email protected]>",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "data-uri-to-buffer",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"Copyright (c) 2014 Nathan Rajlich <[email protected]>",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "socks-proxy-agent",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"Copyright (c) 2013 Nathan Rajlich <[email protected]>",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "http-proxy-agent",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"Copyright (c) 2013 Nathan Rajlich <[email protected]>",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "agent-base",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"Copyright (c) 2013 Nathan Rajlich <[email protected]>",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
 	}
 ]

cli/src/commands/tunnels.rs

@@ -35,7 +35,7 @@ use crate::{
 	},
 	util::{
 		app_lock::AppMutex,
-		errors::{wrap, AnyError},
+		errors::{wrap, AnyError, CodeError},
 		prereqs::PreReqChecker,
 	},
 };
@@ -247,17 +247,25 @@ pub async fn kill(ctx: CommandContext) -> Result<i32, AnyError> {
 }
 
 pub async fn status(ctx: CommandContext) -> Result<i32, AnyError> {
-	let status: protocol::singleton::Status = do_single_rpc_call(
+	let status = do_single_rpc_call::<_, protocol::singleton::Status>(
 		&ctx.paths.tunnel_lockfile(),
 		ctx.log.clone(),
 		protocol::singleton::METHOD_STATUS,
 		protocol::EmptyObject {},
 	)
-	.await?;
-
-	ctx.log.result(serde_json::to_string(&status).unwrap());
+	.await;
 
-	Ok(0)
+	match status {
+		Err(CodeError::NoRunningTunnel) => {
+			ctx.log.result(CodeError::NoRunningTunnel.to_string());
+			Ok(1)
+		}
+		Err(e) => Err(e.into()),
+		Ok(s) => {
+			ctx.log.result(serde_json::to_string(&s).unwrap());
+			Ok(0)
+		}
+	}
 }
 
 /// Removes unused servers.