add Directory.Packages.props

fernandoescolar · Nov 29, 2024 · 157489e · 157489e
1 parent 0f06ace
commit 157489e
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 34 deletions.
diff --git a/src/language/LanguageExtensions.ts b/src/language/LanguageExtensions.ts
@@ -3,7 +3,7 @@ import { NugetVersionCodeActionProvider } from "./actions/NugetVersionCodeAction
 import { NugetNameCompletionItemProvider } from "./completions/NugetNameCompletionItemProvider";
 import { NugetVersionCompletionItemProvider } from "./completions/NugetVersionCompletionItemProvider";
 import { CodeDecoratorController } from "./decorators/CodeDecoratorController";
-import { CSPROJ } from "./filters";
+import { CSPROJ, PACKAGES_PROPS } from "./filters";
 import { NugetVersionDecorator } from "./decorators/NugetVersionDecorator";
 
 export class LanguageExtensions {
@@ -12,27 +12,34 @@ export class LanguageExtensions {
     }
 
     register() {
-        const decorator = new CodeDecoratorController(this.context, [
-            new NugetVersionDecorator()
-        ]);
+        const fileTypes = [
+            { filter: CSPROJ, tagName: "PackageReference"},
+            { filter: PACKAGES_PROPS, tagName: "PackageVersion"}
+        ];
+
+        const decorator = new CodeDecoratorController(this.context,
+            fileTypes.map(({filter, tagName}) => new NugetVersionDecorator(filter, tagName))
+        );
         decorator.register();
 
-        this.context.subscriptions.push(vscode.languages.registerCodeActionsProvider(
-            CSPROJ,
-            new NugetVersionCodeActionProvider(),
-        ));
-
-        this.context.subscriptions.push(vscode.languages.registerCompletionItemProvider(
-            CSPROJ,
-            new NugetNameCompletionItemProvider(),
-            '.', '"'
-        ));
-
-        this.context.subscriptions.push(vscode.languages.registerCompletionItemProvider(
-            CSPROJ,
-            new NugetVersionCompletionItemProvider(),
-            '.', '"'
-        ));
+        fileTypes.forEach(({filter, tagName}) => {
+            this.context.subscriptions.push(vscode.languages.registerCodeActionsProvider(
+                filter,
+                new NugetVersionCodeActionProvider(tagName),
+            ));
+
+            this.context.subscriptions.push(vscode.languages.registerCompletionItemProvider(
+                filter,
+                new NugetNameCompletionItemProvider(tagName),
+                '.', '"'
+            ));
+
+            this.context.subscriptions.push(vscode.languages.registerCompletionItemProvider(
+                filter,
+                new NugetVersionCompletionItemProvider(tagName),
+                '.', '"'
+            ));
+        });
     }
 
 }
diff --git a/src/language/actions/NugetVersionCodeActionProvider.ts b/src/language/actions/NugetVersionCodeActionProvider.ts
@@ -2,10 +2,15 @@ import * as vscode from "vscode";
 import * as nuget from '@extensions/nuget';
 
 export class NugetVersionCodeActionProvider implements vscode.CodeActionProvider {
+    private readonly regEx: RegExp;
+
+    constructor(tagName: string) {
+        this.regEx = new RegExp(`<${tagName} Include="(.*)" Version="(.*)"`);
+    }
+
     async provideCodeActions(document: vscode.TextDocument, range: vscode.Range | vscode.Selection, context: vscode.CodeActionContext, token: vscode.CancellationToken): Promise<(vscode.CodeAction | vscode.Command)[] | null | undefined> {
         const line = document.lineAt(range.start.line).text;
-        const regEx = /<PackageReference Include="(.*)" Version="(.*)" /;
-        const match = regEx.exec(line);
+        const match = this.regEx.exec(line);
         if (!match) {
             return undefined;
         }

diff --git a/src/language/completions/NugetNameCompletionItemProvider.ts b/src/language/completions/NugetNameCompletionItemProvider.ts
@@ -2,10 +2,15 @@ import * as vscode from "vscode";
 import * as nuget from '@extensions/nuget';
 
 export class NugetNameCompletionItemProvider implements vscode.CompletionItemProvider {
+    private readonly regEx: RegExp;
+
+    constructor(tagName: string) {
+        this.regEx = new RegExp(`<${tagName} Include="([^"\n]*)$`);
+    }
+
     async provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, context: vscode.CompletionContext): Promise<vscode.CompletionItem[] | vscode.CompletionList<vscode.CompletionItem> | null | undefined> {
         const linePrefix = document.lineAt(position).text.substr(0, position.character);
-        const regEx = /<PackageReference Include="([^"\n]*)$/;
-        const match = regEx.exec(linePrefix);
+        const match = this.regEx.exec(linePrefix);
         if (!match) {
             return undefined;
         }

diff --git a/src/language/completions/NugetVersionCompletionItemProvider.ts b/src/language/completions/NugetVersionCompletionItemProvider.ts
@@ -2,10 +2,15 @@ import * as vscode from "vscode";
 import * as nuget from '@extensions/nuget';
 
 export class NugetVersionCompletionItemProvider implements vscode.CompletionItemProvider {
+    private readonly regEx: RegExp;
+
+    constructor(tagName: string) {
+        this.regEx = new RegExp(`<${tagName} Include="(.*)" `);
+    }
+
     async provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, context: vscode.CompletionContext): Promise<vscode.CompletionItem[] | vscode.CompletionList<vscode.CompletionItem> | null | undefined> {
         const linePrefix = document.lineAt(position).text.substr(0, position.character);
-        const regEx = /<PackageReference Include="(.*)" /;
-        const match = regEx.exec(linePrefix);
+        const match = this.regEx.exec(linePrefix);
         if (!match) {
             return undefined;
         }

diff --git a/src/language/decorators/NugetVersionDecorator.ts b/src/language/decorators/NugetVersionDecorator.ts
@@ -1,7 +1,6 @@
 import * as vscode from "vscode";
 import * as nuget from "@extensions/nuget";
 import { ICodeDecorator } from "./ICodeDecorator";
-import { CSPROJ } from "../filters";
 
 export class NugetVersionDecorator implements ICodeDecorator
 {
@@ -24,17 +23,18 @@ export class NugetVersionDecorator implements ICodeDecorator
         }
     });
 
-    get filter(): vscode.DocumentSelector {
-        return CSPROJ;
+    private readonly regEx: RegExp;
+
+    constructor(public readonly filter: vscode.DocumentSelector,tagName: string) {
+        this.regEx = new RegExp(`<${tagName} Include="(.+)" Version="(.+)"`, "g");
     }
 
     async decorate(editor: vscode.TextEditor): Promise<void> {
         const text = editor.document.getText();
         const okDecorations: vscode.DecorationOptions[] = [];
         const newDecorations: vscode.DecorationOptions[] = [];
-        const regEx = /<PackageReference Include="(.+)" Version="(.+)"/g;
         let match;
-        while ((match = regEx.exec(text))) {
+        while ((match = this.regEx.exec(text))) {
             const id = match[1];
             const version = match[2];
             const versions = await nuget.searchPackageVersions(editor.document.uri.fsPath, id);
@@ -50,12 +50,12 @@ export class NugetVersionDecorator implements ICodeDecorator
 
             if (isNew) {
                 newDecorations.push(decoration);
+                editor.setDecorations(this.newType, newDecorations);
             } else {
                 okDecorations.push(decoration);
+                editor.setDecorations(this.okType, okDecorations);
             }
         }
 
-        editor.setDecorations(this.okType, okDecorations);
-        editor.setDecorations(this.newType, newDecorations);
     }
 }
diff --git a/src/language/filters.ts b/src/language/filters.ts
@@ -1,3 +1,5 @@
 import * as vscode from "vscode";
 
-export const CSPROJ: vscode.DocumentSelector = { pattern: '**/*.csproj' };
+export const CSPROJ: vscode.DocumentSelector = { pattern: '**/*.csproj' };
+
+export const PACKAGES_PROPS: vscode.DocumentSelector = { pattern: '**/*.Packages.props' };