Skip to content

Normalize file path when generating package name #3

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
wesleyegberto merged 1 commit into from
Jul 9, 2021
Merged

Normalize file path when generating package name #3

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
15 changes: 9 additions & 6 deletions src/file-content-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { parseJavaClassesFromFile } from './class-parser';
import { JavaClass } from './types';
import { ExtensionSettings, getExtensionConfiguration } from './vscode-settings';

const isWindows = process.platform === 'win32';

export async function generateTestClassFileContent(
javaFileUri: vscode.Uri,
javaClassName: string,
Expand Down Expand Up @@ -57,21 +59,22 @@ export function generateEmptyClassContent(packageName: string, className: string

export function createPackageNameFromUri(uri: vscode.Uri, filename: string | null = null, isTest: boolean = false): string {
const pathPrefix = isTest ? '/src/test/java' : '/src/main/java';
const startIndex = uri.fsPath.indexOf(pathPrefix) + 15; // '/src/test/java/'.length
let endIndex = uri.path.length;
const posixPath = isWindows ? uri.path.replace(/\\/g,'/') : uri.path;
const startIndex = posixPath.indexOf(pathPrefix) + 15; // '/src/test/java/'.length
let endIndex = posixPath.length;

const extension = posix.extname(uri.path);
const extension = posix.extname(posixPath);
if (extension && extension.length > 0) {
if (!filename || !filename.length) {
filename = posix.basename(uri.path);
filename = posix.basename(posixPath);
}
endIndex = uri.fsPath.indexOf(filename) - 1;
endIndex = posixPath.indexOf(filename) - 1;
if (startIndex >= endIndex) {
return '';
}
}

return uri.fsPath.substring(startIndex, endIndex).replace(/\//g, '.');
return posixPath.substring(startIndex, endIndex).replace(/\//g, '.');
}

function createTestClass(javaClass: JavaClass, settings: ExtensionSettings) {
Expand Down