Skip to content
Open
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
14 changes: 13 additions & 1 deletion vscode/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@
"workspaceContains:**/Directory.Build.props",
"onLanguage:Directory.Packages.props",
"workspaceContains:**/Directory.Packages.props",
"onLanguage:cs",
"workspaceContains:**/*.cs",
"onLanguage:pubspec.yaml",
"workspaceContains:**/pubspec.yaml"
],
Expand Down Expand Up @@ -1060,9 +1062,10 @@
"fast-xml-parser": "5.2.5",
"node-cache": "5.1.2",
"release-please": "16.12.0",
"semver": "7.6.3"
"semver": "7.6.3",
"semver-regex": "4.0.5"
},
"extensionDependencies": [
"vscode.git"
]
}
}
2 changes: 1 addition & 1 deletion vscode/src/api/indexes/dependi/reports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const getLangIdFromName = (name: string): Language => {
if (exactMatch) {
return exactMatch.ID;
}
if (name.toLowerCase().endsWith(".csproj")) {
if (name.toLowerCase().endsWith(".csproj") || name.toLowerCase().endsWith(".cs")) {
return Language.CSharp;
}
return Language.None;
Expand Down
6 changes: 5 additions & 1 deletion vscode/src/commands/report-generator/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { PyProjectParser } from "../../core/parsers/PyProjectParser";
import { openDeviceLimitDialog, openPaymentRequiredDialog, openSettingsDialog } from "../../ui/dialogs";
import { PubspecParser } from "../../core/parsers/PubspecParser";
import { CsprojParser } from "../../core/parsers/CsprojParser";
import { CsFileParser } from "../../core/parsers/CsFileParser";

export const parserInvoker = (language: string) => {
switch (language) {
Expand All @@ -33,7 +34,10 @@ export const parserInvoker = (language: string) => {
case "Directory.Packages.props":
return new CsprojParser();
default:
// Check if it's a .csproj file
// Check either .cs or .csproj file
if (language.endsWith(".cs")) {
return new CsFileParser();
}
if (language.endsWith(".csproj")) {
return new CsprojParser();
}
Expand Down
2 changes: 1 addition & 1 deletion vscode/src/core/Language.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function setLanguage(file?: string) {
case "directory.packages.props":
return setLanguageConfig(Language.CSharp, "csharp", filename, OCVEnvironment.Nuget);
default:
if (fileExtension === ".csproj") {
if (fileExtension === ".csproj" || fileExtension === ".cs") {
return setLanguageConfig(Language.CSharp, "csharp", filename, OCVEnvironment.Nuget);
}
if ((fileExtension === ".txt" || fileExtension === ".in") && filename.toLowerCase().startsWith("requirement")) {
Expand Down
4 changes: 2 additions & 2 deletions vscode/src/core/listeners/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { PubspecListener } from "./PubspecListener";
import { PubDevFetcher } from "../fetchers/PubDevFetcher";
import { PubspecParser } from "../parsers/PubspecParser";
import { NuGetFetcher } from "../fetchers/NuGetFetcher";
import { CsprojParser } from "../parsers/CsprojParser";
import { CsParser } from "../parsers/CsParser";
import { CSharpListener } from "./CSharpListener";

export default async function listener(editor: TextEditor | undefined): Promise<void> {
Expand Down Expand Up @@ -90,7 +90,7 @@ export default async function listener(editor: TextEditor | undefined): Promise<
return;
listener = new CSharpListener(
new NuGetFetcher(Settings.csharp.index, Configs.CSHARP_INDEX_SERVER_URL),
new CsprojParser());
new CsParser());
break;
}
if (listener !== undefined) {
Expand Down
55 changes: 55 additions & 0 deletions vscode/src/core/parsers/CsFileParser.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { TextDocument } from "vscode";
import Item from "../Item";
import { Parser } from "./parser";
import semverRegex from 'semver-regex';

export class CsFileParser implements Parser {
parse(doc: TextDocument): Item[] {
let items: Item[] = [];

for (let row = 0; row < doc.lineCount; row++) {
const line = doc.lineAt(row);

if (line.isEmptyOrWhitespace) {
continue;
}

const isShebang = line.text.startsWith("#!");
if (isShebang) {
continue;
}

const matches = /^#:package (.+)@(.+)/.exec(line.text);
if (matches) {
const packageName = matches[1];
const packagePart = matches[2].trim();

const packageVersion = packagePart.match(semverRegex())?.[0];
if (!packageVersion) {
continue;
}

const endOfPackageName = "#:package".length + packageName.length;
const startOfVersion = line.text.indexOf(packageVersion, endOfPackageName);
const endOfVersion = startOfVersion + packageVersion.length;

const item = new Item();
item.copyFrom(
packageName,
packageVersion,
startOfVersion,
endOfVersion,
line.lineNumber,
line.range.end.character
);
item.createRange();
item.createDecoRange();
items.push(item);
}

break;
}

return items;
}
}
17 changes: 17 additions & 0 deletions vscode/src/core/parsers/CsParser.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { TextDocument } from "vscode";
import Item from "../Item";
import { Parser } from "./parser";
import { CsprojParser } from "./CsprojParser";
import { CsFileParser } from "./CsFileParser";

export class CsParser implements Parser {
csprojParser = new CsprojParser();
csFileParser = new CsFileParser();

parse(doc: TextDocument): Item[] {
if (doc.fileName.endsWith(".cs")) {
return this.csFileParser.parse(doc);
}
return this.csprojParser.parse(doc);
}
}