From 0ecb37ca4a19137e17b98eb7e21db387a03aa936 Mon Sep 17 00:00:00 2001 From: Daniel OBrien Date: Tue, 30 Jan 2024 17:28:04 -0500 Subject: [PATCH] prettier fixes --- src/configurationMenu.ts | 21 +++++++++++---------- src/extension.ts | 4 ++-- src/providers/authProvider.ts | 2 +- src/providers/codeRefs.ts | 4 +--- src/providers/flagListView.ts | 11 ++++++++--- src/utils.ts | 18 ++++-------------- test/providers.test.ts | 2 +- 7 files changed, 28 insertions(+), 34 deletions(-) diff --git a/src/configurationMenu.ts b/src/configurationMenu.ts index e14f4971..c6293e8d 100644 --- a/src/configurationMenu.ts +++ b/src/configurationMenu.ts @@ -57,17 +57,18 @@ export class ConfigurationMenu { async pickProject(input: MultiStepInput, state: CMState) { const session = await authentication.getSession('launchdarkly', ['writer'], { createIfNone: false }); if (session === undefined) { - const selection = await window - .showInformationMessage( - 'You are not logged into LaunchDarkly. Please sign in to LaunchDarkly to continue.', - 'Sign In', - ) - if (selection) { - if (selection === 'Sign In') { - const session = await authentication.getSession('launchdarkly', ['writer'], { createIfNone: true }) as LaunchDarklyAuthenticationSession; - this.config.setSession(session); - } + const selection = await window.showInformationMessage( + 'You are not logged into LaunchDarkly. Please sign in to LaunchDarkly to continue.', + 'Sign In', + ); + if (selection) { + if (selection === 'Sign In') { + const session = (await authentication.getSession('launchdarkly', ['writer'], { + createIfNone: true, + })) as LaunchDarklyAuthenticationSession; + this.config.setSession(session); } + } } const projectOptions: QuickPickItem[] = [ { label: 'Retrieving projects...it may take a moment.', description: '', detail: '' }, diff --git a/src/extension.ts b/src/extension.ts index ec5752d9..364d5d39 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -102,11 +102,11 @@ export async function activate(ctx: ExtensionContext): Promise { } if ((ctx.secrets.get('launchdarkly_accessToken') || semver.lt(storedVersion, '4.99.10')) && session === undefined) { - //if (semver.lt(storedVersion, '4.99.1')) { + //if (semver.lt(storedVersion, '4.99.1')) { window .showInformationMessage( `LaunchDarkly: Please [Sign In](command:vscode-launchdarkly-authprovider.signIn) as part your extension update.`, - `Sign In` + `Sign In`, ) .then(async (item) => { switch (item) { diff --git a/src/providers/authProvider.ts b/src/providers/authProvider.ts index 11f7b3d3..cc26a6ae 100644 --- a/src/providers/authProvider.ts +++ b/src/providers/authProvider.ts @@ -251,7 +251,7 @@ export class LaunchDarklyAuthenticationProvider implements AuthenticationProvide } // If secret existed in secret store, it's now moved to session. await this.context.secrets.delete('launchdarkly_accessToken'); - + return { access_token: updatedToken, refresh_token: '', baseUri: appBaseUri }; } diff --git a/src/providers/codeRefs.ts b/src/providers/codeRefs.ts index c922ea19..90e88a01 100644 --- a/src/providers/codeRefs.ts +++ b/src/providers/codeRefs.ts @@ -106,9 +106,7 @@ export class FlagAliases { if (!session || !intConfig) { return; } - const apiToken = legacyAuth() - ? session.accessToken - : `Bearer ${session.accessToken}`; + const apiToken = legacyAuth() ? session.accessToken : `Bearer ${session.accessToken}`; try { const codeRefsBin = await this.getCodeRefsBin(); const command = `${codeRefsBin} --dir="${directory}" --dryRun --outDir="${outDir}" --projKey="${intConfig.project}" --repoName="${repoName}" --baseUri="${session.fullUri}" --contextLines=-1 --branch=scan --revision=0`; diff --git a/src/providers/flagListView.ts b/src/providers/flagListView.ts index ec736b6c..14b6d9a8 100644 --- a/src/providers/flagListView.ts +++ b/src/providers/flagListView.ts @@ -140,9 +140,14 @@ export class LaunchDarklyFlagListProvider implements TreeDataProvider newElement.list = [codelensFlag.range]; this.flagNodes.push(newElement); } else { - newElement = new FlagItem(codelensFlag.flag, TreeItemCollapsibleState.Collapsed, codelensFlag.flag, [ - codelensFlag.range, - ], null, 'FlagItem'); + newElement = new FlagItem( + codelensFlag.flag, + TreeItemCollapsibleState.Collapsed, + codelensFlag.flag, + [codelensFlag.range], + null, + 'FlagItem', + ); } logDebugMessage(`Setting Flag: ${JSON.stringify(codelensFlag)}`); this.flagMap.set(codelensFlag.flag, newElement); diff --git a/src/utils.ts b/src/utils.ts index 9ed519a3..7822958c 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -67,27 +67,20 @@ export async function setupComponents(config: LDExtensionConfiguration, reload = const flagView = new LaunchDarklyTreeViewProvider(config); const codeLens = new FlagCodeLensProvider(config); - const enableFlagListView = workspace.getConfiguration('launchdarkly').get('enableFlagsInFile', false) + const enableFlagListView = workspace.getConfiguration('launchdarkly').get('enableFlagsInFile', false); let listViewDisp = Disposable.from(); if (enableFlagListView) { const listView = new LaunchDarklyFlagListProvider(config, codeLens); window.registerTreeDataProvider('launchdarklyFlagList', listView); listViewDisp = commands.registerCommand('launchdarkly.refreshFlagLens', () => listView.setFlagsinDocument()); - config - .getCtx() - .subscriptions.push( - window.onDidChangeActiveTextEditor(listView.setFlagsinDocument), - listViewDisp - ); + config.getCtx().subscriptions.push(window.onDidChangeActiveTextEditor(listView.setFlagsinDocument), listViewDisp); } - - const enableReleasesView = workspace.getConfiguration('launchdarkly').get('enableReleasesView', false) + const enableReleasesView = workspace.getConfiguration('launchdarkly').get('enableReleasesView', false); if (enableReleasesView) { const releaseView = new LaunchDarklyReleaseProvider(config); window.registerTreeDataProvider('launchdarklyReleases', releaseView); } - config.setFlagView(flagView); @@ -98,8 +91,6 @@ export async function setupComponents(config: LDExtensionConfiguration, reload = treeDataProvider: flagView, }), ); - - const LD_MODE: DocumentFilter = { scheme: 'file', @@ -107,7 +98,6 @@ export async function setupComponents(config: LDExtensionConfiguration, reload = const hoverProviderDisp = languages.registerHoverProvider(LD_MODE, new LaunchDarklyHoverProvider(config)); try { - const flagToggle = commands.registerCommand('launchdarkly.toggleFlagCmdPrompt', async () => { await showToggleMenu(config); }); @@ -311,6 +301,6 @@ function createFallthroughOrOffInstruction(kind: string, variationId: string) { } export function legacyAuth() { - return true; + return true; //workspace.getConfiguration('launchdarkly').get('legacyAuth', false) } diff --git a/test/providers.test.ts b/test/providers.test.ts index 0f9c5996..433bd6f3 100644 --- a/test/providers.test.ts +++ b/test/providers.test.ts @@ -41,7 +41,7 @@ const flag = new FeatureFlag({ clientSideAvailability: { usingMobileKey: false, usingEnvironmentId: false, - } + }, }); const flagConfig: FlagConfiguration = {