hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

117616: Fixed unique-decorators rule not working in IntelliJ because the decorator calls were registered every time the file was updated

Browse Source
This commit is contained in:
Alexandre Vryghem
2024-10-04 18:50:16 +02:00
parent c6657b5f9b
commit 6017537107
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lint/src/rules/ts/unique-decorators.ts
View File

@@ -16,7 +16,16 @@ export enum Message {
DUPLICATE_DECORATOR_CALL = 'duplicateDecoratorCall', DUPLICATE_DECORATOR_CALL = 'duplicateDecoratorCall',
} }
const decoratorCalls: Map<string, Set<string>> = new Map(); /**
* Saves the decorators by decoratorName → file → Set<String>
*/
const decoratorCalls: Map<string, Map<string, Set<string>>> = new Map();
/**
* Keep a list of the files wo contain a decorator. This is done in order to prevent the `Program` selector from being
* run for every file.
*/
const fileWithDecorators: Set<string> = new Set();
export interface UniqueDecoratorsOptions { export interface UniqueDecoratorsOptions {
decorators: string[]; decorators: string[];
@@ -72,6 +81,13 @@ export const rule = ESLintUtils.RuleCreator.withoutDocs({
create(context: TSESLint.RuleContext<Message, unknown[]>, options: any) { create(context: TSESLint.RuleContext<Message, unknown[]>, options: any) {
return { return {
['Program']: () => {
if (fileWithDecorators.has(context.physicalFilename)) {
for (const decorator of options[0].decorators) {
decoratorCalls.get(decorator)?.get(context.physicalFilename)?.clear();
}
}
},
[`ClassDeclaration > Decorator > CallExpression[callee.name=/^(${options[0].decorators.join('|')})$/]`]: (node: TSESTree.CallExpression) => { [`ClassDeclaration > Decorator > CallExpression[callee.name=/^(${options[0].decorators.join('|')})$/]`]: (node: TSESTree.CallExpression) => {
if (isTestFile(context)) { if (isTestFile(context)) {
return; return;
@@ -82,7 +98,9 @@ export const rule = ESLintUtils.RuleCreator.withoutDocs({
return; return;
} }
if (!isUnique(node)) { fileWithDecorators.add(context.physicalFilename);
if (!isUnique(node, context.physicalFilename)) {
context.report({ context.report({
messageId: Message.DUPLICATE_DECORATOR_CALL, messageId: Message.DUPLICATE_DECORATOR_CALL,
node: node, node: node,
@@ -180,22 +198,29 @@ function callKey(node: TSESTree.CallExpression): string {
return key; return key;
} }
function isUnique(node: TSESTree.CallExpression): boolean { function isUnique(node: TSESTree.CallExpression, filePath: string): boolean {
const decorator = (node.callee as TSESTree.Identifier).name; const decorator = (node.callee as TSESTree.Identifier).name;
if (!decoratorCalls.has(decorator)) { if (!decoratorCalls.has(decorator)) {
decoratorCalls.set(decorator, new Set()); decoratorCalls.set(decorator, new Map());
}
if (!decoratorCalls.get(decorator)!.has(filePath)) {
decoratorCalls.get(decorator)!.set(filePath, new Set());
} }
const key = callKey(node); const key = callKey(node);
let unique = true; let unique = true;
if (decoratorCalls.get(decorator)?.has(key)) { for (const decoratorCallsByFile of decoratorCalls.get(decorator)!.values()) {
unique = !unique; if (decoratorCallsByFile.has(key)) {
unique = !unique;
break;
}
} }
decoratorCalls.get(decorator)?.add(key); decoratorCalls.get(decorator)?.get(filePath)?.add(key);
return unique; return unique;
} }