Skip to content

Commit

Permalink
code tweak for pr comments
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-zhang-at-salesforce committed Jun 25, 2024
1 parent 7efca93 commit 98b19fd
Showing 1 changed file with 17 additions and 14 deletions.
31 changes: 17 additions & 14 deletions src/commands/lint/configureLintingToolsCommand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,24 @@ const configureLintingToolsCommand =
const config = workspace.getConfiguration();

class EslintDependencyConfig {
readonly name: string;
readonly packageJsonPropertyId: string;
readonly version: string;
readonly eslintrcExtend: string;
readonly name: string;
readonly packageConfigPropertyId: string;
readonly eslintConfigToExtend: string;

constructor(
name: string,
packageJsonPropertyId: string,
eslintrcExtend: string
eslintConfigToExtend: string
) {
this.name = name;
this.packageJsonPropertyId = packageJsonPropertyId;
this.eslintrcExtend = eslintrcExtend;
this.version = config.get(this.packageJsonPropertyId) as string;
this.packageConfigPropertyId = packageJsonPropertyId;
this.eslintConfigToExtend = eslintConfigToExtend;
}

getVersion(): string {
return config.get(this.packageConfigPropertyId) as string;
}

}

const eslintDependencies: EslintDependencyConfig[] = [
Expand Down Expand Up @@ -81,7 +84,7 @@ export class ConfigureLintingToolsCommand {

// Ask user to add eslint plugin
const result = await this.showMessage(
'Do you want to add the ESLint plugins related to LWC offline capabilities to your project? This will give you linting feedback on code patterns that will not support your LWCs working offline, for mobile use cases.',
'Do you want to add Salesforce code linting guidance for Mobile and Offline capabilities? These tools will identify code patterns that cause problems in Mobile and Offline use cases.',
MessageType.InformationYesNo
);

Expand Down Expand Up @@ -153,9 +156,9 @@ export class ConfigureLintingToolsCommand {

if (devDependencies) {
eslintDependencies.forEach((dependencyConfig) => {
const { name, version } = dependencyConfig;
const { name } = dependencyConfig;
if (!devDependencies[name]) {
devDependencies[name] = version;
devDependencies[name] = dependencyConfig.getVersion();
modified = true;
}
});
Expand Down Expand Up @@ -188,8 +191,8 @@ export class ConfigureLintingToolsCommand {
let modified = false;

eslintDependencies.forEach((config) => {
if (!eslintrcExtends.includes(config.eslintrcExtend)) {
eslintrcExtends.push(config.eslintrcExtend);
if (!eslintrcExtends.includes(config.eslintConfigToExtend)) {
eslintrcExtends.push(config.eslintConfigToExtend);
modified = true;
}
});
Expand All @@ -207,7 +210,7 @@ export class ConfigureLintingToolsCommand {
// Create eslintrc
const eslintrc = {
extends: eslintDependencies.map((config) => {
return `${config.eslintrcExtend}`;
return `${config.eslintConfigToExtend}`;
})
};

Expand Down

0 comments on commit 98b19fd

Please sign in to comment.