Skip to content

Commit 1b76f57

Browse files
author
Noam Kfir
committed
Lint
1 parent a8b0a66 commit 1b76f57

File tree

7 files changed

+50
-72
lines changed

7 files changed

+50
-72
lines changed

src/extension.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export async function activate(context: vscode.ExtensionContext)
3636
const codeInspector = new CodeInspector();
3737
const symbolProvider = new SymbolProvider(supportedLanguages, codeInspector);
3838
const analyticsProvider = new AnalyticsProvider(workspaceState);
39-
const documentInfoProvider = new DocumentInfoProvider(analyticsProvider, symbolProvider,workspaceState);
39+
const documentInfoProvider = new DocumentInfoProvider(analyticsProvider, symbolProvider, workspaceState);
4040
const editorHelper = new EditorHelper(sourceControl, documentInfoProvider);
41-
const codeLensProvider = new AnaliticsCodeLens(documentInfoProvider,workspaceState)
41+
const codeLensProvider = new AnaliticsCodeLens(documentInfoProvider, workspaceState);
4242

4343
if(!workspaceState.environment){
4444
const firstEnv = (await analyticsProvider.getEnvironments()).firstOrDefault();

src/services/EditorHelper.ts

Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,80 +30,68 @@ export class EditorHelper {
3030
private _documentInfoProvider: DocumentInfoProvider,
3131
) {}
3232

33-
public async goToFileAndLine(editorInfo?: EditorInfo)
34-
{
33+
public async goToFileAndLine(editorInfo?: EditorInfo) {
3534
if(!editorInfo?.workspaceUri) {
3635
return;
3736
}
3837

3938
const workspaceUri = editorInfo.workspaceUri;
4039
const lineNumber = editorInfo.lineNumber ?? 0;
4140

42-
try
43-
{
41+
try {
4442
let doc: vscode.TextDocument | undefined = undefined;
4543

46-
if(!await utils.fileExists(workspaceUri))
47-
{
44+
if(!await utils.fileExists(workspaceUri)) {
4845
doc = await this.askAndOpenFromSourceControl(editorInfo);
4946
}
50-
else
51-
{
47+
else {
5248
doc = await vscode.workspace.openTextDocument(workspaceUri);
5349

5450
const txtLine = doc.lineAt(lineNumber-1);
55-
var fileChanged:boolean = false;
56-
if (editorInfo.executedCode){
51+
let fileChanged:boolean = false;
52+
if (editorInfo.executedCode) {
5753
fileChanged = (txtLine.text.trim() !== editorInfo.executedCode);
5854
}
5955
else {
6056
try {
61-
var sourceDoc = await this.getFromSourceControl(workspaceUri, editorInfo.lastInstanceCommitId!);
62-
if (sourceDoc){
57+
const sourceDoc = await this.getFromSourceControl(workspaceUri, editorInfo.lastInstanceCommitId!);
58+
if (sourceDoc) {
6359
fileChanged = (txtLine.text.trim() !== sourceDoc.lineAt(lineNumber-1).text.trim());
6460
}
65-
else{
61+
else {
6662
return;
6763
}
6864
}
69-
catch (exeption){
65+
catch(exeption) {
7066
await vscode.window.showWarningMessage(
7167
'Cannot locate file in source control. Please make sure its checked in');
7268
}
73-
74-
7569
}
76-
if(fileChanged)
77-
{
70+
if(fileChanged) {
7871
doc = await this.askAndOpenFromSourceControl(editorInfo);;
7972
}
80-
else
81-
{
73+
else {
8274
const docInfo = await this._documentInfoProvider.getDocumentInfo(doc);
8375
const methodInfos = docInfo?.methods || [];
84-
if(methodInfos.all(m => m.symbol.name != editorInfo.functionName))
85-
{
76+
if(methodInfos.all(m => m.symbol.name != editorInfo.functionName)) {
8677
doc = await this.askAndOpenFromSourceControl(editorInfo);
8778
}
8879
}
8980
}
9081

91-
if(doc)
92-
{
82+
if(doc) {
9383
await this.openFileAndLine(doc, lineNumber);
9484
}
9585
}
96-
catch(error)
97-
{
86+
catch(error) {
9887
Logger.error(`Failed to open file: ${editorInfo.modulePhysicalPath}`, error);
9988
vscode.window.showErrorMessage(`Failed to open file: ${editorInfo.modulePhysicalPath}`)
10089
}
10190
}
10291

103-
public async openTextDocumentFromUri(uri: vscode.Uri) : Promise<vscode.TextDocument>{
92+
public async openTextDocumentFromUri(uri: vscode.Uri) : Promise<vscode.TextDocument> {
10493
let doc = await vscode.workspace.openTextDocument(uri);
10594
return doc;
106-
10795
}
10896

10997
public async openFileAndLine(doc: vscode.TextDocument, lineNumber: number) {
@@ -118,18 +106,16 @@ export class EditorHelper {
118106
return await vscode.window.showTextDocument(doc);
119107
}
120108

121-
private async askAndOpenFromSourceControl(editorInfo: EditorInfo) : Promise<vscode.TextDocument | undefined>
122-
{
123-
if(!this._sourceControl.current)
124-
{
109+
private async askAndOpenFromSourceControl(editorInfo: EditorInfo) : Promise<vscode.TextDocument | undefined> {
110+
if(!this._sourceControl.current) {
125111
const sel = await vscode.window.showWarningMessage(
126112
'File version is different from the version recorded in this flow.\nPlease configure source control.',
127113
'configure');
128-
if(sel == 'configure')
114+
if(sel == 'configure') {
129115
await vscode.commands.executeCommand("workbench.action.openWorkspaceSettings", {query: Settings.sourceControl.key});
116+
}
130117
}
131-
else
132-
{
118+
else {
133119
let sel = await vscode.window.showWarningMessage(
134120
`File version is different from the version recorded in this flow, would you like to open the remote version of the file' installed.`,
135121
'yes'
@@ -180,8 +166,8 @@ export class EditorHelper {
180166
}
181167

182168
public async getExecutedCodeFromScm(uri: vscode.Uri, commit: string, line: integer) : Promise<string |undefined>{
183-
var doc = await this.getFromSourceControl(uri, commit);
184-
if (doc){
169+
const doc = await this.getFromSourceControl(uri, commit);
170+
if (doc) {
185171
return doc.lineAt(line-1).text.trim();
186172
}
187173
}

src/services/languages/csharp/languageExtractor.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import { CSharpParametersExtractor } from './parametersExtractor';
88
import { CSharpSpanExtractor } from './spanExtractor';
99
// import { AspNetCoreMvcEndpointExtractor } from './AspNetCoreMvcEndpointExtractor';
1010

11-
export class CSharpLanguageExtractor extends LanguageExtractor
12-
{
11+
export class CSharpLanguageExtractor extends LanguageExtractor {
1312
public requiredExtensionLoaded: boolean = false;
1413

1514
public get requiredExtensionId(): string {

src/services/languages/go/languageExtractor.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import { IModulePathToUriConverter, LogicalModulePathToUriConverter, PhysicalMod
77
import { GoMethodExtractor } from './methodExtractor';
88
import { GoSpanExtractor } from './spanExtractor';
99

10-
export class GoLanguageExtractor extends LanguageExtractor
11-
{
10+
export class GoLanguageExtractor extends LanguageExtractor {
1211
public requiredExtensionLoaded: boolean = false;
1312

1413
public get requiredExtensionId(): string {

src/services/languages/javascript/languageExtractor.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import { JSSpanExtractor } from './spanExtractor';
1010
import { JSPackageReader } from './packageReader';
1111
import { JSPackageToUriConverter } from './modulePathToUriConverters';
1212

13-
export class JSLanguageExtractor extends LanguageExtractor
14-
{
15-
13+
export class JSLanguageExtractor extends LanguageExtractor {
1614
private packageReader: JSPackageReader = new JSPackageReader();
1715
public requiredExtensionLoaded: boolean = false;
1816

src/services/languages/python/languageExtractor.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import { IModulePathToUriConverter, PhysicalModulePathToUriConverter } from '../
66
import { PythonMethodExtractor } from './methodExtractor';
77
import { PythonSpanExtractor } from './spanExtractor';
88

9-
10-
export class PythonLanguageExtractor extends LanguageExtractor
11-
{
9+
export class PythonLanguageExtractor extends LanguageExtractor {
1210
public requiredExtensionLoaded: boolean = false;
1311

1412
public get requiredExtensionId(): string {

src/views/codeAnalytics/errorsViewTab.ts

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ import { WorkspaceState } from "../../state";
2626
import { ErrorsLineDecorator } from "./decorators/errorsLineDecorator";
2727
import { ErrorFlowParameterDecorator } from "./decorators/errorFlowParameterDecorator";
2828

29-
export class ErrorsViewTab implements ICodeAnalyticsViewTab
30-
{
29+
export class ErrorsViewTab implements ICodeAnalyticsViewTab {
3130
private _viewedCodeObjectId?: string = undefined;
3231
private _stackViewModel?: ErrorFlowStackViewModel = undefined;
3332
private _disposables: vscode.Disposable[] = [];
@@ -38,7 +37,6 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
3837
public static readonly ShowErrorView = `digma.ErrorView.show`;
3938
};
4039

41-
4240
constructor(
4341
private _channel: WebviewChannel,
4442
private _analyticsProvider: AnalyticsProvider,
@@ -61,7 +59,7 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
6159

6260
this._disposables.push(vscode.commands.registerCommand(ErrorsViewTab.Commands.ShowErrorView, async (codeObjectId: string, codeObjectDisplayName: string, errorSourceUID: string) => {
6361
const view = this._webViewProvider.get();
64-
if(view === undefined || view.visible === false){
62+
if(view === undefined || view.visible === false) {
6563

6664
this._channel.consume(UiMessage.Notify.TabLoaded, async (e: UiMessage.Notify.TabLoaded)=>{
6765
this.onShowErrorDetailsEvent(new UiMessage.Get.ErrorDetails(errorSourceUID));
@@ -130,7 +128,7 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
130128
}
131129
const document = editor.document;
132130
let docInfo = await this._documentInfoProvider.getDocumentInfo(document);
133-
if (!docInfo){
131+
if (!docInfo) {
134132
return;
135133
}
136134

@@ -157,7 +155,7 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
157155
}
158156
catch(e)
159157
{
160-
if(!(e instanceof HttpError) || e.status !== 404){
158+
if(!(e instanceof HttpError) || e.status !== 404) {
161159
Logger.error(`Failed to get codeObject ${codeObject.id} errors`, e);
162160
const html = HtmlHelper.getErrorMessage("Failed to fetch errors from Digma server.\nSee Output window from more info.");
163161
this._channel.publish(new UiMessage.Set.ErrorsList(html));
@@ -171,7 +169,7 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
171169

172170
const codeObjectGroupEnv = new CodeObjectGroupEnvironments(this._webViewUris, this._workspaceState);
173171

174-
if (errors.length==0){
172+
if (errors.length == 0) {
175173
let html =codeObjectGroupEnv.getUsageHtml(undefined,undefined,usageResults);
176174
html += `${HtmlHelper.getInfoMessage("Great news! No errors recorded here yet. Fingers crossed...")}`;
177175
this._channel.publish(new UiMessage.Set.ErrorsList(html));
@@ -188,10 +186,7 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
188186
}
189187
}
190188

191-
192-
193-
194-
private async onShowErrorDetailsEvent(e: UiMessage.Get.ErrorDetails){
189+
private async onShowErrorDetailsEvent(e: UiMessage.Get.ErrorDetails) {
195190
if(!e.errorSourceUID) {
196191
return;
197192
}
@@ -210,15 +205,15 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
210205
const stackViewModel = viewModels.firstOrDefault();
211206
this._stackViewModel = stackViewModel;
212207
this._stackViewModels = viewModels;
213-
let html = ErrorsHtmlBuilder.buildErrorDetails(errorDetails, viewModels);
208+
const html = ErrorsHtmlBuilder.buildErrorDetails(errorDetails, viewModels);
214209
this._overlay.show(html, this.errorOverlayId);
215210
this.navigateErrorFlow();
216211
this.updateEditorDecorations(stackViewModel);
217212
}
218213

219214
private onOverlayVisibilityChanged(e: UiMessage.Notify.OverlayVisibilityChanged)
220215
{
221-
if(e.visible !== undefined && e.id ===this.errorOverlayId){//error overlay visibility changed
216+
if(e.visible !== undefined && e.id === this.errorOverlayId) {//error overlay visibility changed
222217
this._errorFlowParamDecorator.enabled = e.visible;
223218
}
224219
}
@@ -284,7 +279,7 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
284279
moduleName,
285280
functionName,
286281
lineNumber,
287-
executedCode: executedCode,
282+
executedCode,
288283
codeObjectId,
289284
parameters,
290285
repeat,
@@ -311,7 +306,7 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
311306
moduleName,
312307
functionName,
313308
lineNumber,
314-
executedCode: executedCode,
309+
executedCode,
315310
codeObjectId,
316311
repeat,
317312
workspaceUri,
@@ -334,7 +329,7 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
334329
lastInstanceCommitId: sourceFlow.lastInstanceCommitId,
335330
affectedSpanPaths: [],
336331
exceptionType: '',
337-
summary: undefined
332+
summary: undefined,
338333
};
339334
viewModels.push(viewModel);
340335
}
@@ -365,24 +360,27 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
365360
if(!docInfo){
366361
return;
367362
}
368-
363+
369364
const methodInfo = docInfo?.methods.firstOrDefault((m) => m.range.contains(position));
370-
if(!methodInfo){
365+
if(!methodInfo) {
371366
return;
372367
}
373368

374-
const codeObject = <CodeObjectInfo>{
375-
id: methodInfo.symbol.id,
376-
methodName: methodInfo.displayName
369+
const codeObject = <CodeObjectInfo>{
370+
id: methodInfo.symbol.id,
371+
methodName: methodInfo.displayName,
377372
};
378373
return codeObject;
379374
}
380375

381-
private async onWorkspaceOnlyChanged(value?: boolean){
382-
if(value != undefined)
376+
private async onWorkspaceOnlyChanged(value?: boolean) {
377+
if(value != undefined) {
383378
await Settings.hideFramesOutsideWorkspace.set(value);
379+
}
384380
}
381+
385382
private errorOverlayId = "errorOverlay";
383+
386384
private async goToFileAndLineById(frameId?: number) {
387385
const frame = this._stackViewModel?.stacks
388386
.flatMap(s => s.frames)

0 commit comments

Comments
 (0)