Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/vscode-snippet-contrib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ using the VSCode code snippet framework.

A code snippet contribution is a VSCode extension which:

1. Declares an `extensionDepedency` to `saposs.code-snippet`:
1. Declares an `extensionDepedency` to `saposs.code-snippet-tool`:
- ```json
{
"extensionDependencies": ["saposs.code-snippet"]
"extensionDependencies": ["saposs.code-snippet-tool"]
}
```
1. Returns an object from its `activate()` method which defines the
Expand Down
2 changes: 1 addition & 1 deletion examples/vscode-snippet-contrib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@types/vscode": "^1.48.0"
},
"extensionDependencies": [
"saposs.code-snippet-framework"
"saposs.code-snippet-tool"
],
"engines": {
"vscode": "^1.44.2"
Expand Down
8 changes: 6 additions & 2 deletions packages/backend/src/contributors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,16 @@ export class Contributors {
}

private getContributorExtension(contributorId: string) {
// Pre-compile regex pattern for better performance
const FRAMEWORK_PATTERN = /^saposs\.code-snippet(?:-tool)?$/;

return _.find(vscode.extensions.all, (extension: vscode.Extension<any>) => {
const extensionDependencies: string[] = _.get(
extension,
"packageJSON.extensionDependencies"
"packageJSON.extensionDependencies",
[]
);
if (_.includes(extensionDependencies, "saposs.code-snippet")) {
if (extensionDependencies.some((dep) => FRAMEWORK_PATTERN.test(dep))) {
if (contributorId === this.getExtensionId(extension)) {
return extension;
}
Expand Down
26 changes: 24 additions & 2 deletions packages/backend/test/contributors.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ describe("Contributors unit test", () => {
packageJSON: {
name: "vscode-snippet-contrib",
publisher: "BLABLA3",
extensionDependencies: ["saposs.code-snippet"],
extensionDependencies: ["saposs.code-snippet-tool"],
},
extensionKind: null as any,
activate: () =>
Expand Down Expand Up @@ -129,6 +129,28 @@ describe("Contributors unit test", () => {
expect(snippet.getMessages()).to.deep.equal(messageValue);
});

it("receives valid contributorId and snippetName from exports ---> returns valid snippet (for old ID)", async () => {
const oldApi = {
...api,
packageJSON: {
...api.packageJSON,
extensionDependencies: ["saposs.code-snippet"],
},
};

_.set(testVscode, "extensions.all", [oldApi]);

const uiOptions = {
contributorId: extensionId,
snippetName: snippetName,
};

loggerWrapperMock.expects("getClassLogger").returns(logger);
const contributors = new Contributors();
const snippet = await contributors.getSnippet(uiOptions);
expect(snippet.getMessages()).to.deep.equal(messageValue);
});

it("receives valid contributorId and snippetName from activate ---> returns valid snippet", async () => {
api.isActive = false;
_.set(testVscode, "extensions.all", [api]);
Expand Down Expand Up @@ -191,7 +213,7 @@ describe("Contributors unit test", () => {
api.packageJSON = {
name: "vscode-snippet-contrib",
publisher: "BLABLA3",
extensionDependencies: ["saposs.code-snippet"],
extensionDependencies: ["saposs.code-snippet-tool"],
};
_.set(testVscode, "extensions.all", [api]);

Expand Down
Loading