Skip to content

updates to correct linter slashes for mixed platform projects #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2023
Merged

updates to correct linter slashes for mixed platform projects #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/lint/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ export class FortranLintingProvider {
if (!modout) return [];

modout = resolveVariables(modout);
if (process.platform === 'win32') modout = modout.replace(/\//g, '\\');
this.logger.debug(`[lint] moduleOutput: ${modFlag} ${modout}`);
return [modFlag, modout];
}
Expand Down
6 changes: 3 additions & 3 deletions src/util/glob-paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ export class GlobPaths {
private globResolution(globPaths: string[]): string[] {
if (globPaths.length === 0) return [];
// Resolve internal variables and expand glob patterns
const globPathsVars = globPaths.map(e => resolveVariables(e));
globPaths = globPaths.map(e => resolveVariables(e));
// fast-glob cannot work with Windows paths
globPaths = globPaths.map(e => e.replace('/\\/g', '/'));
globPaths = globPaths.map(e => e.replace(/\\/g, '/'));
// This needs to be after the resolvevariables since {} are used in globs
// try {
// const globIncPaths: string[] = fg.sync(globPathsVars, {
Expand All @@ -49,7 +49,7 @@ export class GlobPaths {
// } catch (eacces) {
try {
const globIncPaths: string[] = [];
for (const i of globPathsVars) {
for (const i of globPaths) {
// use '/' to match only directories and not files
globIncPaths.push(...glob.sync(i + '/'));
}
Expand Down