Skip to content

Commit

Permalink
Split mainline releases and prereleases
Browse files Browse the repository at this point in the history
  • Loading branch information
@TwitchBronBron
TwitchBronBron committed Sep 20, 2024
1 parent c7bf7e5 commit 758c2a8
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 24 deletions.
33 changes: 22 additions & 11 deletions src/commands/LanguageServerInfoCommand.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ describe('LanguageServerInfoCommand', () => {
command['discoverBrighterScriptVersions']([tempDir])
).to.eql([{
label: `Use VSCode's version`,
description: embeddedBscVersion
description: embeddedBscVersion,
value: 'embedded'
}]);
});

Expand All @@ -91,7 +92,8 @@ describe('LanguageServerInfoCommand', () => {
command['discoverBrighterScriptVersions']([tempDir])
).to.eql([{
label: `Use VSCode's version`,
description: embeddedBscVersion
description: embeddedBscVersion,
value: 'embedded'
}]);
});

Expand All @@ -101,11 +103,13 @@ describe('LanguageServerInfoCommand', () => {
command['discoverBrighterScriptVersions']([tempDir])
).to.eql([{
label: `Use VSCode's version`,
description: embeddedBscVersion
description: embeddedBscVersion,
value: 'embedded'
}, {
label: `Use Workspace Version`,
description: '1.2.3',
detail: 'node_modules/brighterscript'
detail: 'node_modules/brighterscript',
value: 'node_modules/brighterscript'
}]);
});

Expand All @@ -115,23 +119,27 @@ describe('LanguageServerInfoCommand', () => {
command['discoverBrighterScriptVersions']([tempDir])
).to.eql([{
label: `Use VSCode's version`,
description: embeddedBscVersion
description: embeddedBscVersion,
value: 'embedded'
}, {
label: `Use Workspace Version`,
description: '1.2.3',
detail: 'node_modules/brighterscript'
detail: 'node_modules/brighterscript',
value: 'node_modules/brighterscript'
}]);

writePackage('2.3.4');
expect(
command['discoverBrighterScriptVersions']([tempDir])
).to.eql([{
label: `Use VSCode's version`,
description: embeddedBscVersion
description: embeddedBscVersion,
value: 'embedded'
}, {
label: `Use Workspace Version`,
description: '2.3.4',
detail: 'node_modules/brighterscript'
detail: 'node_modules/brighterscript',
value: 'node_modules/brighterscript'
}]);
});

Expand All @@ -141,19 +149,22 @@ describe('LanguageServerInfoCommand', () => {
command['discoverBrighterScriptVersions']([tempDir])
).to.eql([{
label: `Use VSCode's version`,
description: embeddedBscVersion
description: embeddedBscVersion,
value: 'embedded'
}, {
label: `Use Workspace Version`,
description: '1.2.3',
detail: 'node_modules/brighterscript'
detail: 'node_modules/brighterscript',
value: 'node_modules/brighterscript'
}]);

fsExtra.removeSync(`${tempDir}/node_modules`);
expect(
command['discoverBrighterScriptVersions']([tempDir])
).to.eql([{
label: `Use VSCode's version`,
description: embeddedBscVersion
description: embeddedBscVersion,
value: 'embedded'
}]);
});
});
Expand Down
38 changes: 31 additions & 7 deletions src/commands/LanguageServerInfoCommand.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ import { VscodeCommand } from './VscodeCommand';
import URI from 'vscode-uri';
import * as relativeTime from 'dayjs/plugin/relativeTime';
import { util } from '../util';
import type { LocalPackageManager } from '../managers/LocalPackageManager';
import { type LocalPackageManager } from '../managers/LocalPackageManager';
import * as semver from 'semver';
import { standardizePath as s } from 'brighterscript';
import * as dayjs from 'dayjs';
import type { QuickPickItem } from 'vscode';
import * as dayjs from 'dayjs';
dayjs.extend(relativeTime);

export class LanguageServerInfoCommand {
public static commandName = 'extension.brightscript.languageServer.info';

public localPackageManager: LocalPackageManager;

public register(context: vscode.ExtensionContext, localPackageManager: LocalPackageManager) {
this.localPackageManager = localPackageManager;

context.subscriptions.push(vscode.commands.registerCommand(LanguageServerInfoCommand.commandName, async () => {
const commands = [{
label: `Change Selected BrighterScript Version`,
Expand Down Expand Up @@ -164,11 +169,30 @@ export class LanguageServerInfoCommand {
description: '',
detail: '',
command: async () => {
let versionsFromNpm: QuickPickItemEnhanced[] = (await versionsFromNpmPromise).map(x => ({
label: x.version,
value: x.version,
description: dayjs(x.date).fromNow(true) + ' ago'
}));
let versionsFromNpm: QuickPickItemEnhanced[] = (await versionsFromNpmPromise).filter(x => !semver.prerelease(x.version)).map(x => {
return {
label: x.version,
value: x.version,
description: `${dayjs(x.date).fromNow(true)} ago`
};
});
return await vscode.window.showQuickPick(versionsFromNpm, { placeHolder: `Select the BrighterScript version used for BrightScript and BrighterScript language features` }) as any;
}
} as any);

//get the full list of versions from npm
quickPickItems.push({
label: '$(package) Install from npm (insider builds)',
description: '',
detail: '',
command: async () => {
let versionsFromNpm: QuickPickItemEnhanced[] = (await versionsFromNpmPromise).filter(x => semver.prerelease(x.version)).map(x => {
return {
label: x.version,
value: x.version,
description: `${dayjs(x.date).fromNow(true)} ago`
};
});
return await vscode.window.showQuickPick(versionsFromNpm, { placeHolder: `Select the BrighterScript version used for BrightScript and BrighterScript language features` }) as any;
}
} as any);
Expand Down
12 changes: 6 additions & 6 deletions src/managers/LocalPackageManager.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,15 +309,15 @@ describe('LocalPackageManager', () => {
});

describe('getVersionDirName', () => {
it('fetches the catalog when not supplied', async () => {
it('fetches the catalog when not supplied', () => {
expect(
await manager['getVersionDirName']('brighterscript', '1.0.0')
manager['getVersionDirName']('brighterscript', '1.0.0')
).to.eql('1.0.0');
});

it('creates a hash', async () => {
it('creates a hash', () => {
expect(
await manager['getVersionDirName']('brighterscript', packageUrl)
manager['getVersionDirName']('brighterscript', packageUrl)
).to.eql(md5(packageUrl));
});

Expand All @@ -333,12 +333,12 @@ describe('LocalPackageManager', () => {

//ask for the dir name, it should come back with the hash of the packageUrl
expect(
await manager['getVersionDirName']('brighterscript', packageUrl2)
manager['getVersionDirName']('brighterscript', packageUrl2)
).to.eql(md5(packageUrl));

//now ask for the dir name, it should come with a number appended to it since that hash already exists
expect(
await manager['getVersionDirName']('brighterscript', packageUrl)
manager['getVersionDirName']('brighterscript', packageUrl)
).to.eql(`${md5(packageUrl)}-1`);
});
});
Expand Down

0 comments on commit 758c2a8

Please sign in to comment.