Skip to content

Commit d7becd7

Browse files
author
viacheslav.sotsenko
committed
fix: project by new prettier rules
1 parent 0091a5a commit d7becd7

File tree

77 files changed

+556
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+556
-232
lines changed

‎.prettierrc

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"singleQuote": true,
33
"tabWidth": 4,
44
"endOfLine": "auto",
5-
"bracketSameLine": false,
6-
"printWidth": 100,
7-
"arrowParens": "always",
5+
"bracketSameLine": true,
86
"bracketSpacing": true,
7+
"singleAttributePerLine": true,
8+
"printWidth": 80,
9+
"arrowParens": "always",
910
"trailingComma": "none",
10-
"htmlWhitespaceSensitivity": "css"
11-
}
11+
"htmlWhitespaceSensitivity": "ignore"
12+
}

‎apps/code-review/src/app/app.module.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { AuthModule, MATERIAL_ICON_DEFAULT_OPTIONS_PROVIDER } from '@acua/shared';
1+
import {
2+
AuthModule,
3+
MATERIAL_ICON_DEFAULT_OPTIONS_PROVIDER
4+
} from '@acua/shared';
25
import { HttpClientModule } from '@angular/common/http';
36
import { NgModule } from '@angular/core';
47
import { BrowserModule } from '@angular/platform-browser';

‎apps/code-review/src/app/app.routes.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ import { Route } from '@angular/router';
33
export const APP_ROUTES: Route[] = [
44
{
55
path: '',
6-
loadChildren: () => import('./remote-entry/entry.module').then((m) => m.RemoteEntryModule)
6+
loadChildren: () =>
7+
import('./remote-entry/entry.module').then(
8+
(m) => m.RemoteEntryModule
9+
)
710
}
811
];

‎apps/code-review/src/app/core/tokens/acua-window.token.ts

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import { DOCUMENT } from '@angular/common';
22
import { inject, InjectionToken } from '@angular/core';
33

4-
export const WINDOW = new InjectionToken<Window>('An abstraction over global window object', {
5-
factory: () => {
6-
const { defaultView } = inject(DOCUMENT);
4+
export const WINDOW = new InjectionToken<Window>(
5+
'An abstraction over global window object',
6+
{
7+
factory: () => {
8+
const { defaultView } = inject(DOCUMENT);
79

8-
if (!defaultView) {
9-
throw new Error('Window is not available');
10-
}
10+
if (!defaultView) {
11+
throw new Error('Window is not available');
12+
}
1113

12-
return defaultView as any;
14+
return defaultView as any;
15+
}
1316
}
14-
});
17+
);

‎apps/code-review/src/app/pages/list/components/all-requests/all-requests.component.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
<ng-container *ngIf="reviewRequests.length; else emptyDataTemplate">
33
<acua-review-request-card
44
*ngFor="let reviewRequest of reviewRequests"
5-
[data]="reviewRequest"
6-
>
7-
</acua-review-request-card>
5+
[data]="reviewRequest"></acua-review-request-card>
86
</ng-container>
97
</ng-container>
108

‎apps/code-review/src/app/pages/list/components/all-requests/all-requests.component.ts

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { ChangeDetectionStrategy, Component } from '@angular/core';
2-
import { CodeReviewRequestStatusEnum, ReviewRequestService } from '@code-review/shared';
2+
import {
3+
CodeReviewRequestStatusEnum,
4+
ReviewRequestService
5+
} from '@code-review/shared';
36

47
@Component({
58
selector: 'acua-all-requests',
@@ -8,9 +11,10 @@ import { CodeReviewRequestStatusEnum, ReviewRequestService } from '@code-review/
811
changeDetection: ChangeDetectionStrategy.OnPush
912
})
1013
export class AllRequestsComponent {
11-
public readonly reviewRequests$ = this.reviewRequestsService.getAllWithStatus(
12-
CodeReviewRequestStatusEnum.Opened
13-
);
14+
public readonly reviewRequests$ =
15+
this.reviewRequestsService.getAllWithStatus(
16+
CodeReviewRequestStatusEnum.Opened
17+
);
1418

1519
constructor(private readonly reviewRequestsService: ReviewRequestService) {}
1620
}

‎apps/code-review/src/app/pages/list/components/historical-requests/historical-requests.component.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
<ng-container *ngIf="reviewRequests.length; else emptyDataTemplate">
33
<acua-review-request-card
44
*ngFor="let reviewRequest of reviewRequests"
5-
[data]="reviewRequest"
6-
>
7-
</acua-review-request-card>
5+
[data]="reviewRequest"></acua-review-request-card>
86
</ng-container>
97
</ng-container>
108

‎apps/code-review/src/app/pages/list/components/historical-requests/historical-requests.component.ts

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { ChangeDetectionStrategy, Component } from '@angular/core';
2-
import { CodeReviewRequestStatusEnum, ReviewRequestService } from '@code-review/shared';
2+
import {
3+
CodeReviewRequestStatusEnum,
4+
ReviewRequestService
5+
} from '@code-review/shared';
36

47
@Component({
58
selector: 'acua-historical-requests',
@@ -8,9 +11,10 @@ import { CodeReviewRequestStatusEnum, ReviewRequestService } from '@code-review/
811
changeDetection: ChangeDetectionStrategy.OnPush
912
})
1013
export class HistoricalRequestsComponent {
11-
public readonly reviewRequests$ = this.reviewRequestsService.getAllWithStatus(
12-
CodeReviewRequestStatusEnum.Closed
13-
);
14+
public readonly reviewRequests$ =
15+
this.reviewRequestsService.getAllWithStatus(
16+
CodeReviewRequestStatusEnum.Closed
17+
);
1418

1519
constructor(private readonly reviewRequestsService: ReviewRequestService) {}
1620
}

‎apps/code-review/src/app/pages/list/components/my-requests/my-requests.component.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<ng-container *ngIf="reviewRequests.length; else emptyDataTemplate">
33
<acua-review-request-card
44
*ngFor="let reviewRequest of reviewRequests"
5-
[data]="reviewRequest"
6-
>
7-
</acua-review-request-card>
5+
[data]="reviewRequest"></acua-review-request-card>
86
</ng-container>
97
</ng-container>
108

119
<ng-template #emptyDataTemplate>
12-
<acua-absent-data>Ви ще не створили жодного запиту на Код-Ревью.</acua-absent-data>
10+
<acua-absent-data>
11+
Ви ще не створили жодного запиту на Код-Ревью.
12+
</acua-absent-data>
1313
</ng-template>

‎apps/code-review/src/app/pages/list/components/review-request-card/review-request-card.component.html

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
<mat-card [routerLink]="reviewPageLink" [relativeTo]="activatedRoute">
1+
<mat-card
2+
[routerLink]="reviewPageLink"
3+
[relativeTo]="activatedRoute">
24
<mat-card-header>
3-
<acua-user-avatar mat-card-avatar class="user-avatar" [avatarUrl]="data.user.photoUrl">
4-
</acua-user-avatar>
5+
<acua-user-avatar
6+
mat-card-avatar
7+
class="user-avatar"
8+
[avatarUrl]="data.user.photoUrl"></acua-user-avatar>
59

6-
<mat-card-title>{{ data.user.firstName }} {{ data.user.lastName }}</mat-card-title>
10+
<mat-card-title>
11+
{{ data.user.firstName }} {{ data.user.lastName }}
12+
</mat-card-title>
713

814
<mat-card-subtitle>{{ data.date | date }}</mat-card-subtitle>
915
</mat-card-header>

‎apps/code-review/src/app/pages/list/components/review-request-creation-button/review-request-creation-button.component.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
*acuaForAuthorizedOnly
33
[label]="'Запросити Код-Ревью'"
44
[iconName]="'add'"
5-
[routerLink]="requestPageLink"
6-
>
7-
</acua-action-button>
5+
[routerLink]="requestPageLink"></acua-action-button>

‎apps/code-review/src/app/pages/list/list.component.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ <h1 class="title">Код-Ревью</h1>
55
<acua-review-request-creation-button></acua-review-request-creation-button>
66
</div>
77

8-
<mat-tab-group [animationDuration]="'0ms'" [mat-stretch-tabs]="isMobile$ | async">
8+
<mat-tab-group
9+
[animationDuration]="'0ms'"
10+
[mat-stretch-tabs]="isMobile$ | async">
911
<mat-tab [label]="'Всі'">
1012
<ng-template matTabContent>
1113
<acua-all-requests></acua-all-requests>
1214
</ng-template>
1315
</mat-tab>
1416

15-
<mat-tab *acuaForAuthorizedOnly [label]="'Мої'">
17+
<mat-tab
18+
*acuaForAuthorizedOnly
19+
[label]="'Мої'">
1620
<ng-template matTabContent>
1721
<acua-my-requests></acua-my-requests>
1822
</ng-template>

‎apps/code-review/src/app/pages/overview/components/code-editor/code-editor.component.ts

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { ChangeDetectionStrategy, Component, Inject, ViewEncapsulation } from '@angular/core';
1+
import {
2+
ChangeDetectionStrategy,
3+
Component,
4+
Inject,
5+
ViewEncapsulation
6+
} from '@angular/core';
27
import type { editor } from 'monaco-editor';
38
import { ReviewRequestCommentsState } from '../../states';
49
import { MonacoApi } from '../../types';
@@ -22,7 +27,12 @@ import { MONACO_API, MONACO_EDITOR } from './tokens';
2227
LineCommentsAmountDirective,
2328
TextSelectionDisablerDirective
2429
],
25-
providers: [MONACO_EDITOR_PROVIDER, MONACO_API_PROVIDER, LanguageService, EditorCommentsState],
30+
providers: [
31+
MONACO_EDITOR_PROVIDER,
32+
MONACO_API_PROVIDER,
33+
LanguageService,
34+
EditorCommentsState
35+
],
2636
encapsulation: ViewEncapsulation.None
2737
})
2838
export class CodeEditorComponent {
@@ -49,13 +59,15 @@ export class CodeEditorComponent {
4959
}
5060

5161
private updateEditorLanguage(fileFullPath: string): void {
52-
const languageId = this.languageService.getLanguageIdByFileFullPath(fileFullPath);
62+
const languageId =
63+
this.languageService.getLanguageIdByFileFullPath(fileFullPath);
5364

5465
this.changeLanguage(languageId);
5566
}
5667

5768
private updateEditorComments(fileFullPath: string): void {
58-
const fileComments = this.reviewRequestCommentsState.getFileCommentsAmount(fileFullPath);
69+
const fileComments =
70+
this.reviewRequestCommentsState.getFileCommentsAmount(fileFullPath);
5971

6072
if (fileComments) {
6173
this.editorCommentsState.set(fileComments);

‎apps/code-review/src/app/pages/overview/components/code-editor/directives/line-comments-amount.directive.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@ export class LineCommentsAmountDirective {
3333
}
3434

3535
private updateCommentAmountWidgets(): void {
36-
this.editorCommentsState.getEntries().forEach(([line, commentAmount]) => {
37-
const lineNumber = +line;
38-
39-
if (commentAmount) {
40-
this.applyWidgetToLine(lineNumber);
41-
}
42-
});
36+
this.editorCommentsState
37+
.getEntries()
38+
.forEach(([line, commentAmount]) => {
39+
const lineNumber = +line;
40+
41+
if (commentAmount) {
42+
this.applyWidgetToLine(lineNumber);
43+
}
44+
});
4345
}
4446

4547
private applyWidgetToLine(lineNumber: number): void {

‎apps/code-review/src/app/pages/overview/components/code-editor/directives/line-highlighter.directive.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,13 @@ export class LineHighlighterDirective implements OnDestroy {
7373
}
7474

7575
private updateDecorationClassNamesForLinesWithComments(): void {
76-
this.editorCommentsState.getEntries().forEach(([line, commentAmount]) => {
77-
if (commentAmount) {
78-
this.updateLineDecoration(+line, HAS_COMMENTS_CLASS);
79-
}
80-
});
76+
this.editorCommentsState
77+
.getEntries()
78+
.forEach(([line, commentAmount]) => {
79+
if (commentAmount) {
80+
this.updateLineDecoration(+line, HAS_COMMENTS_CLASS);
81+
}
82+
});
8183
}
8284

8385
private updateLineDecoration(line: number, className: string = ''): void {

‎apps/code-review/src/app/pages/overview/components/code-editor/helpers/line-check.helper.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import type { editor } from 'monaco-editor';
22
import { LINE_DECORATION_CLASS_NAME } from '../constants';
33

4-
export function isTargetOverActualLineOfCode(mouseTarget: editor.IMouseTarget): boolean {
5-
const isTargetLineDecoratorElement = mouseTarget.element?.classList.contains(
6-
LINE_DECORATION_CLASS_NAME
7-
);
4+
export function isTargetOverActualLineOfCode(
5+
mouseTarget: editor.IMouseTarget
6+
): boolean {
7+
const isTargetLineDecoratorElement =
8+
mouseTarget.element?.classList.contains(LINE_DECORATION_CLASS_NAME);
89

910
return !!isTargetLineDecoratorElement;
1011
}

‎apps/code-review/src/app/pages/overview/components/code-editor/models/comment-content-widget.model.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ export class CommentContentWidget implements editor.IContentWidget {
2525
return this.monacoApi.editor.ContentWidgetPositionPreference;
2626
}
2727

28-
constructor(private readonly lineNumber: number, private readonly injector: Injector) {}
28+
constructor(
29+
private readonly lineNumber: number,
30+
private readonly injector: Injector
31+
) {}
2932

3033
public getId(): string {
3134
return `comment.amount.${this.lineNumber}`;
@@ -47,7 +50,9 @@ export class CommentContentWidget implements editor.IContentWidget {
4750

4851
private createComponentRef(): ComponentRef<CommentsAmountComponent> {
4952
const viewContainerRef = this.injector.get(ViewContainerRef);
50-
const component = viewContainerRef.createComponent(CommentsAmountComponent);
53+
const component = viewContainerRef.createComponent(
54+
CommentsAmountComponent
55+
);
5156
component.instance.amount = this.getCommentsAmount();
5257

5358
component.changeDetectorRef.detectChanges();

‎apps/code-review/src/app/pages/overview/components/code-editor/models/line-decoration.model.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@ export class LineDecoration implements editor.IModelDeltaDecoration {
1414
className: `${LINE_DECORATION_CLASS_NAME} ${this.className}`
1515
};
1616

17-
constructor(private readonly lineNumber: number, private readonly className: string) {}
17+
constructor(
18+
private readonly lineNumber: number,
19+
private readonly className: string
20+
) {}
1821
}

‎apps/code-review/src/app/pages/overview/components/code-editor/services/language.service.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ export class LanguageService {
1919
public getLanguageIdByFileFullPath(fileFullPath: string): string {
2020
const fileExtension = this.getFileExtension(fileFullPath);
2121

22-
return this.fileExtensionMap.get(fileExtension) ?? this.defaultLanguageId;
22+
return (
23+
this.fileExtensionMap.get(fileExtension) ?? this.defaultLanguageId
24+
);
2325
}
2426

2527
private getFileExtension(fileFullPath: string): string {

‎apps/code-review/src/app/pages/overview/components/code-editor/tokens/monaco-editor.token.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { InjectionToken } from '@angular/core';
22
import type { editor } from 'monaco-editor';
33

4-
export const MONACO_EDITOR = new InjectionToken<editor.IStandaloneCodeEditor>('MONACO_EDITOR');
4+
export const MONACO_EDITOR = new InjectionToken<editor.IStandaloneCodeEditor>(
5+
'MONACO_EDITOR'
6+
);

‎apps/code-review/src/app/pages/overview/components/file-explorer/components/file-tree-node/file-tree-node.component.html

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1-
<div class="monaco-tree-row" [class.selected]="isSelected" (click)="onRowClick()">
1+
<div
2+
class="monaco-tree-row"
3+
[class.selected]="isSelected"
4+
(click)="onRowClick()">
25
<span [style.margin-left]="marginLeftStyleValue"></span>
36

47
<i
58
*ngIf="doChildrenExist"
69
class="monaco-tree-arrow codicon codicon-chevron-down"
7-
[class.open]="this.isOpened"
8-
></i>
10+
[class.open]="this.isOpened"></i>
911

10-
<img [src]="fileExplorerIconSrc" class="icon" />
12+
<img
13+
[src]="fileExplorerIconSrc"
14+
class="icon" />
1115

12-
<div [title]="node.fullPath" class="monaco-tree-name">
16+
<div
17+
[title]="node.fullPath"
18+
class="monaco-tree-name">
1319
{{ node.name }}
1420
</div>
1521
</div>
@@ -19,7 +25,5 @@
1925
*ngFor="let node of node.children"
2026
[node]="node"
2127
[depth]="incrementedDepth"
22-
(fileSelected)="fileSelected.emit($event)"
23-
>
24-
</acua-file-tree-node>
28+
(fileSelected)="fileSelected.emit($event)"></acua-file-tree-node>
2529
</ng-container>

0 commit comments

Comments
 (0)