From 4788b5403bf2e8d8ef0f4f2b31ae0377ccc70833 Mon Sep 17 00:00:00 2001 From: Maksim Syomochkin Date: Mon, 6 Dec 2021 21:52:48 +0300 Subject: [PATCH] rename user=>name --- package.json | 6 +++--- src/extension.ts | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 1d1e40c..03d7878 100644 --- a/package.json +++ b/package.json @@ -35,13 +35,13 @@ "type": "string", "description": "Remote domain for check" }, - "gitcheck.user": { + "gitcheck.name": { "type":"string", - "description": "Username for gitcheck domain" + "description": "user.name for gitcheck domain" }, "gitcheck.email": { "type":"string", - "description": "Email for gitcheck domain" + "description": "user.email for gitcheck domain" } } } diff --git a/src/extension.ts b/src/extension.ts index 99e6eb9..69227dd 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -4,14 +4,14 @@ import { GitExtension } from './git'; export async function activate() { var conf = vscode.workspace.getConfiguration("gitcheck"); const domain = conf.get("domain"); - const user = conf.get("user"); + const name = conf.get("name"); const email = conf.get("email"); if (!vscode.workspace.workspaceFolders) { return; } - if (!(domain && user && email)) { + if (!(domain && name && email)) { console.log("Missing config params"); return; } @@ -27,7 +27,7 @@ export async function activate() { const pushUrl = remote.pushUrl; if (pushUrl && pushUrl.includes(domain)) { var gitConfig = await repository.getConfigs(); - var gitUser:string = ""; + var gitName:string = ""; var gitEmail:string = ""; gitConfig = gitConfig.filter( elem => { return elem.key === "user.name" || elem.key === "user.email"; @@ -39,7 +39,7 @@ export async function activate() { gitConfig.forEach(c => { switch (c.key) { case "user.name": - gitUser = c.value; + gitName = c.value; break; case "user.email": @@ -50,7 +50,7 @@ export async function activate() { console.log(c.key); } }); - if (gitUser !== user || gitEmail !== email) { + if (gitName !== name || gitEmail !== email) { vscode.window.showErrorMessage("Wrong user creds in git"); } }