Skip to content

Commit

Permalink
style: apply automated linter fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
megalinter-bot committed Oct 5, 2023
1 parent 9f6012c commit c738486
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 35 deletions.
4 changes: 2 additions & 2 deletions src/language/safe-ds-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { SafeDsValueConverter } from './grammar/safe-ds-value-converter.js';
import { SafeDsTypeComputer } from './typing/safe-ds-type-computer.js';
import { SafeDsCoreClasses } from './builtins/safe-ds-core-classes.js';
import { SafeDsPackageManager } from './workspace/safe-ds-package-manager.js';
import {SafeDsNodeMapper} from "./helpers/safe-ds-node-mapper.js";
import { SafeDsNodeMapper } from './helpers/safe-ds-node-mapper.js';

/**
* Declaration of custom services - add your own service classes here.
Expand All @@ -30,7 +30,7 @@ export type SafeDsAddedServices = {
};
helpers: {
NodeMapper: SafeDsNodeMapper;
},
};
types: {
TypeComputer: SafeDsTypeComputer;
};
Expand Down
33 changes: 6 additions & 27 deletions src/language/validation/names.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,7 @@ const acceptCasingWarning = (
// -----------------------------------------------------------------------------

export const annotationMustContainUniqueNames = (node: SdsAnnotation, accept: ValidationAcceptor): void => {
namesMustBeUnique(
parametersOrEmpty(node),
(name) => `A parameter with name '${name}' exists already.`,
accept,
);
namesMustBeUnique(parametersOrEmpty(node), (name) => `A parameter with name '${name}' exists already.`, accept);
};

export const blockLambdaMustContainUniqueNames = (node: SdsBlockLambda, accept: ValidationAcceptor): void => {
Expand All @@ -159,11 +155,7 @@ export const blockLambdaMustContainUniqueNames = (node: SdsBlockLambda, accept:
};

export const callableTypeMustContainUniqueNames = (node: SdsCallableType, accept: ValidationAcceptor): void => {
namesMustBeUnique(
parametersOrEmpty(node),
(name) => `A parameter with name '${name}' exists already.`,
accept,
);
namesMustBeUnique(parametersOrEmpty(node), (name) => `A parameter with name '${name}' exists already.`, accept);
namesMustBeUnique(
resultsOrEmpty(node.resultList),
(name) => `A result with name '${name}' exists already.`,
Expand All @@ -172,10 +164,7 @@ export const callableTypeMustContainUniqueNames = (node: SdsCallableType, accept
};

export const classMustContainUniqueNames = (node: SdsClass, accept: ValidationAcceptor): void => {
const typeParametersAndParameters = [
...typeParametersOrEmpty(node.typeParameterList),
...parametersOrEmpty(node),
];
const typeParametersAndParameters = [...typeParametersOrEmpty(node.typeParameterList), ...parametersOrEmpty(node)];
namesMustBeUnique(
typeParametersAndParameters,
(name) => `A type parameter or parameter with name '${name}' exists already.`,
Expand All @@ -194,10 +183,7 @@ export const enumMustContainUniqueNames = (node: SdsEnum, accept: ValidationAcce
};

export const enumVariantMustContainUniqueNames = (node: SdsEnumVariant, accept: ValidationAcceptor): void => {
const typeParametersAndParameters = [
...typeParametersOrEmpty(node.typeParameterList),
...parametersOrEmpty(node),
];
const typeParametersAndParameters = [...typeParametersOrEmpty(node.typeParameterList), ...parametersOrEmpty(node)];
namesMustBeUnique(
typeParametersAndParameters,
(name) => `A type parameter or parameter with name '${name}' exists already.`,
Expand All @@ -206,18 +192,11 @@ export const enumVariantMustContainUniqueNames = (node: SdsEnumVariant, accept:
};

export const expressionLambdaMustContainUniqueNames = (node: SdsExpressionLambda, accept: ValidationAcceptor): void => {
namesMustBeUnique(
parametersOrEmpty(node),
(name) => `A parameter with name '${name}' exists already.`,
accept,
);
namesMustBeUnique(parametersOrEmpty(node), (name) => `A parameter with name '${name}' exists already.`, accept);
};

export const functionMustContainUniqueNames = (node: SdsFunction, accept: ValidationAcceptor): void => {
const typeParametersAndParameters = [
...typeParametersOrEmpty(node.typeParameterList),
...parametersOrEmpty(node),
];
const typeParametersAndParameters = [...typeParametersOrEmpty(node.typeParameterList), ...parametersOrEmpty(node)];
namesMustBeUnique(
typeParametersAndParameters,
(name) => `A type parameter or parameter with name '${name}' exists already.`,
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/nodeFinder.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { createSafeDsServices } from '../../src/language/safe-ds-module.js';
import { EmptyFileSystem } from 'langium';
import { AssertionError } from 'assert';
import { clearDocuments, parseHelper } from 'langium/test';
import {isSdsClass, isSdsDeclaration, isSdsEnum} from '../../src/language/generated/ast.js';
import { isSdsClass, isSdsDeclaration, isSdsEnum } from '../../src/language/generated/ast.js';

describe('getNodeByLocation', () => {
const services = createSafeDsServices(EmptyFileSystem).SafeDs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe('SafeDsNodeMapper', () => {

const firstCall = await getNodeOfType(services, code, isSdsAbstractCall);
const parameterNames = argumentsOrEmpty(firstCall).map(parameterNameOrNull);
expect(parameterNames).toStrictEqual(["p2", "p3", "p1"]);
expect(parameterNames).toStrictEqual(['p2', 'p3', 'p1']);
});
});

Expand All @@ -61,7 +61,7 @@ describe('SafeDsNodeMapper', () => {

const firstCall = await getNodeOfType(services, code, isSdsAbstractCall);
const parameterNames = argumentsOrEmpty(firstCall).map(parameterNameOrNull);
expect(parameterNames).toStrictEqual(["p1", "p2", "p3"]);
expect(parameterNames).toStrictEqual(['p1', 'p2', 'p3']);
});

it('should return undefined if a prior argument is named', async () => {
Expand All @@ -75,7 +75,7 @@ describe('SafeDsNodeMapper', () => {

const firstCall = await getNodeOfType(services, code, isSdsAbstractCall);
const parameterNames = argumentsOrEmpty(firstCall).map(parameterNameOrNull);
expect(parameterNames).toStrictEqual(["p2", undefined, undefined]);
expect(parameterNames).toStrictEqual(['p2', undefined, undefined]);
});

it('should return undefined if argument is out of bounds and there is no final variadic parameter', async () => {
Expand All @@ -89,7 +89,7 @@ describe('SafeDsNodeMapper', () => {

const firstCall = await getNodeOfType(services, code, isSdsAbstractCall);
const parameterNames = argumentsOrEmpty(firstCall).map(parameterNameOrNull);
expect(parameterNames).toStrictEqual(["p1", "p2", undefined]);
expect(parameterNames).toStrictEqual(['p1', 'p2', undefined]);
});

it('should return return the final variadic parameter if argument is out of bounds', async () => {
Expand All @@ -103,7 +103,7 @@ describe('SafeDsNodeMapper', () => {

const firstCall = await getNodeOfType(services, code, isSdsAbstractCall);
const parameterNames = argumentsOrEmpty(firstCall).map(parameterNameOrNull);
expect(parameterNames).toStrictEqual(["p1", "p2", "p3", "p3", "p3"]);
expect(parameterNames).toStrictEqual(['p1', 'p2', 'p3', 'p3', 'p3']);
});
});

Expand Down

0 comments on commit c738486

Please sign in to comment.