From 0fc57a4a11625517494ce57e14fbce9cdd409f87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 02:57:24 +0000 Subject: [PATCH 1/2] Bump prettier from 3.1.1 to 3.6.2 Bumps [prettier](https://github.com/prettier/prettier) from 3.1.1 to 3.6.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.1.1...3.6.2) --- updated-dependencies: - dependency-name: prettier dependency-version: 3.6.2 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 85208a63..9eb154ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5463,9 +5463,9 @@ } }, "node_modules/prettier": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", - "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", + "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -10679,9 +10679,9 @@ "dev": true }, "prettier": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", - "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", + "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", "dev": true }, "prettier-linter-helpers": { From 8ad94b4a3c896c541bb31bb02f2e3e7c249a6766 Mon Sep 17 00:00:00 2001 From: Kolja Lampe Date: Tue, 29 Jul 2025 00:56:46 +0200 Subject: [PATCH 2/2] Format --- src/browser/fileSystem.ts | 4 ++-- src/browser/indexedDB.ts | 5 +---- .../addMissingRecordFieldCodeAction.ts | 4 ++-- src/common/providers/codeLensProvider.ts | 4 ++-- .../diagnostics/diagnosticsProvider.ts | 5 +++-- .../diagnostics/elmAnalyseJsonService.ts | 7 ++++--- .../providers/diagnostics/elmLsDiagnostics.ts | 9 ++++---- .../handlers/moveRefactoringHandler.ts | 17 ++++++++------- src/common/util/sequence.ts | 5 +---- src/compiler/patternMatches.ts | 5 +---- src/compiler/program.ts | 5 +---- src/compiler/typeChecker.ts | 21 +++++++++---------- src/compiler/typeExpression.ts | 14 +++++++------ src/compiler/typeInference.ts | 10 ++++----- 14 files changed, 52 insertions(+), 63 deletions(-) diff --git a/src/browser/fileSystem.ts b/src/browser/fileSystem.ts index 709c31ed..bd7e964f 100644 --- a/src/browser/fileSystem.ts +++ b/src/browser/fileSystem.ts @@ -168,8 +168,8 @@ async function getIndexedDbFileSystemProvider(): Promise { - const elmMakeDiagnostics = - await this.elmMakeDiagnostics.createDiagnostics(sourceFile); + const elmMakeDiagnostics = await this.elmMakeDiagnostics.createDiagnostics( + sourceFile, + ); this.resetDiagnostics(elmMakeDiagnostics, DiagnosticKind.ElmMake); diff --git a/src/common/providers/diagnostics/elmAnalyseJsonService.ts b/src/common/providers/diagnostics/elmAnalyseJsonService.ts index 215afb4e..82f15846 100644 --- a/src/common/providers/diagnostics/elmAnalyseJsonService.ts +++ b/src/common/providers/diagnostics/elmAnalyseJsonService.ts @@ -60,9 +60,10 @@ export class ElmAnalyseJsonService implements IElmAnalyseJsonService { let elmAnalyseJson = {}; try { - elmAnalyseJson = require( - path.join(workspacePath, "elm-analyse.json"), - ) as IElmAnalyseJson; + elmAnalyseJson = require(path.join( + workspacePath, + "elm-analyse.json", + )) as IElmAnalyseJson; } catch { this.connection.console.info( "No elm-analyse.json found, enabling all diagnostic checks.", diff --git a/src/common/providers/diagnostics/elmLsDiagnostics.ts b/src/common/providers/diagnostics/elmLsDiagnostics.ts index c5999f70..a3c4fb67 100644 --- a/src/common/providers/diagnostics/elmLsDiagnostics.ts +++ b/src/common/providers/diagnostics/elmLsDiagnostics.ts @@ -916,11 +916,10 @@ export class ElmLsDiagnostics { const listConcats = this.unnecessaryListConcatQuery .matches(tree.rootNode) - .filter( - (match) => - match.captures[2].node?.namedChildren.every( - (c) => c.type === "list_expr", - ), + .filter((match) => + match.captures[2].node?.namedChildren.every( + (c) => c.type === "list_expr", + ), ) .map((match) => match.captures[0].node) .filter(Utils.notUndefinedOrNull); diff --git a/src/common/providers/handlers/moveRefactoringHandler.ts b/src/common/providers/handlers/moveRefactoringHandler.ts index a227c339..4556643f 100644 --- a/src/common/providers/handlers/moveRefactoringHandler.ts +++ b/src/common/providers/handlers/moveRefactoringHandler.ts @@ -65,8 +65,9 @@ export class MoveRefactoringHandler { } const tree = params.program.getSourceFile(params.sourceUri)?.tree; - const destinationTree = params.program.getSourceFile(params.destination.uri) - ?.tree; + const destinationTree = params.program.getSourceFile( + params.destination.uri, + )?.tree; if (tree && destinationTree) { const nodeAtPosition = TreeUtils.getNamedDescendantForPosition( @@ -84,21 +85,21 @@ export class MoveRefactoringHandler { ? nodeAtPosition.parent?.parent?.previousNamedSibling : undefined : isTypeNode - ? nodeAtPosition.parent - : undefined; + ? nodeAtPosition.parent + : undefined; const declarationNode = isDeclarationNode ? nodeAtPosition.parent?.parent : isTypeNode - ? nodeAtPosition.parent?.nextNamedSibling - : undefined; + ? nodeAtPosition.parent?.nextNamedSibling + : undefined; const commentNode = typeNode?.previousNamedSibling?.type === "block_comment" ? typeNode.previousNamedSibling : declarationNode?.previousNamedSibling?.type === "block_comment" - ? declarationNode.previousNamedSibling - : undefined; + ? declarationNode.previousNamedSibling + : undefined; const functionName = nodeAtPosition.text; diff --git a/src/common/util/sequence.ts b/src/common/util/sequence.ts index 0481be25..28ef70c0 100644 --- a/src/common/util/sequence.ts +++ b/src/common/util/sequence.ts @@ -1,10 +1,7 @@ export class Sequence { private mappers: ((value: T) => unknown)[] = []; - constructor( - private first: T, - private getter: (value: T) => T | undefined, - ) {} + constructor(private first: T, private getter: (value: T) => T | undefined) {} private iterator = function* ( first: T, diff --git a/src/compiler/patternMatches.ts b/src/compiler/patternMatches.ts index 5c8bda6c..98fa42be 100644 --- a/src/compiler/patternMatches.ts +++ b/src/compiler/patternMatches.ts @@ -78,10 +78,7 @@ const list: Union = { const nil: Pattern = Ctor(list, nilName, []); export class PatternMatches { - constructor( - private program: IProgram, - private sourceFile: ISourceFile, - ) {} + constructor(private program: IProgram, private sourceFile: ISourceFile) {} public static check( region: SyntaxNode, diff --git a/src/compiler/program.ts b/src/compiler/program.ts index e431b516..73c1ca19 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -156,10 +156,7 @@ export class Program implements IProgram { private disposables: Disposable[] = []; - constructor( - private rootPath: URI, - programHost: IProgramHost, - ) { + constructor(private rootPath: URI, programHost: IProgramHost) { this.settings = container.resolve("Settings"); this.connection = container.resolve("Connection"); this.parser = container.resolve("Parser"); diff --git a/src/compiler/typeChecker.ts b/src/compiler/typeChecker.ts index fdfbfa9d..32d962d1 100644 --- a/src/compiler/typeChecker.ts +++ b/src/compiler/typeChecker.ts @@ -566,9 +566,9 @@ export function createTypeChecker(program: IProgram): TypeChecker { isTypeUsage ? symbol.type === "Type" || symbol.type === "TypeAlias" : isConstructorUsage - ? symbol.type === "UnionConstructor" || - (symbol.type === "TypeAlias" && symbol.constructors?.length) - : symbol.type === "UnionConstructor", + ? symbol.type === "UnionConstructor" || + (symbol.type === "TypeAlias" && symbol.constructors?.length) + : symbol.type === "UnionConstructor", ) ?? []; if (localSymbols.length > 0) { @@ -675,14 +675,13 @@ export function createTypeChecker(program: IProgram): TypeChecker { nodeAtPosition, (node) => node.parent ?? undefined, ) - .map( - (node) => - sourceFile.symbolLinks - ?.get(node) - ?.get( - nodeAtPositionText, - (s) => s.node.type !== "infix_declaration", - ), + .map((node) => + sourceFile.symbolLinks + ?.get(node) + ?.get( + nodeAtPositionText, + (s) => s.node.type !== "infix_declaration", + ), ) .find(Utils.notUndefined); diff --git a/src/compiler/typeExpression.ts b/src/compiler/typeExpression.ts index e5768ef9..1f91b909 100644 --- a/src/compiler/typeExpression.ts +++ b/src/compiler/typeExpression.ts @@ -408,14 +408,16 @@ export class TypeExpression { const fieldRefs = RecordFieldReferenceTable.fromExpressions(fieldExpressions); - const baseTypeDefinition = findDefinition(record.baseType, this.program) - ?.expr; + const baseTypeDefinition = findDefinition( + record.baseType, + this.program, + )?.expr; const baseType = baseTypeDefinition ? this.getTypeVar(baseTypeDefinition) : record.baseType - ? TVar(record.baseType.text) - : undefined; + ? TVar(record.baseType.text) + : undefined; const type = TRecord(fieldTypes, baseType, undefined, fieldRefs); @@ -512,8 +514,8 @@ export class TypeExpression { const params = declaredType?.alias ? declaredType.alias.parameters : declaredType?.nodeType === "Union" - ? declaredType.params - : []; + ? declaredType.params + : []; if (declaredType.nodeType !== "Unknown" && params.length !== args.length) { this.diagnostics.push( diff --git a/src/compiler/typeInference.ts b/src/compiler/typeInference.ts index e8d2cdbc..4a458a3c 100644 --- a/src/compiler/typeInference.ts +++ b/src/compiler/typeInference.ts @@ -619,12 +619,10 @@ export class InferenceScope { binding.bindingType === "Annotated" ? (binding).type : binding.bindingType === "Unannotated" - ? binding.count === 0 - ? bodyType - : uncurryFunction( - TFunction((binding).params, bodyType), - ) - : bodyType; + ? binding.count === 0 + ? bodyType + : uncurryFunction(TFunction((binding).params, bodyType)) + : bodyType; return this.toTopLevelResult(type, replaceExpressionTypes); }