Merge 790f33d into 7964a9d

CHANGELOG.md

@@ -11,6 +11,8 @@ Bug-fixes within the same version aren't needed
 
 ## Master
 
+* Highlight the full line of the jest error, not just the first 6 characters - ThomasRooney
+
 ### 2.7.0
 
 * Add the ability to configure debugging of tests - stephtr, connectdotz

src/diagnostics.ts

@@ -32,9 +32,16 @@ export function updateDiagnostics(testResults: TestFileAssertionStatus[], diagno
             `received invalid line number '${assertion.line}' for '${uri.toString()}'. (most likely due to unexpected test results... you can help fix the root cause by logging an issue with a sample project to reproduce this warning)`
           )
         }
-        const start = 0
+        let startColumn = 0
+        let endColumn = Number.MAX_SAFE_INTEGER
+        const associatedTextEditor = vscode.window.visibleTextEditors.find(e => e.document.uri.fsPath === uri.fsPath)
+        if (associatedTextEditor) {
+          const textLine = associatedTextEditor.document.lineAt(line)
+          startColumn = textLine.firstNonWhitespaceCharacterIndex
+          endColumn = textLine.text.length
+        }
         const diag = new vscode.Diagnostic(
-          new vscode.Range(line, start, line, start + 6),
+          new vscode.Range(line, startColumn, line, endColumn),
           assertion.terseMessage || assertion.shortMessage || assertion.message,
           vscode.DiagnosticSeverity.Error
         )

tests/diagnostics.test.ts

@@ -1,5 +1,4 @@
 jest.unmock('../src/diagnostics')
-
 import { updateDiagnostics, resetDiagnostics, failedSuiteCount } from '../src/diagnostics'
 import * as vscode from 'vscode'
 import { TestFileAssertionStatus, TestReconcilationState, TestAssertionStatus } from 'jest-editor-support'
@@ -15,6 +14,8 @@ class MockDiagnosticCollection implements vscode.DiagnosticCollection {
   dispose = jest.fn()
 }
 
+vscode.window.visibleTextEditors = []
+
 describe('test diagnostics', () => {
   describe('resetDiagnostics', () => {
     it('will clear given diagnostics', () => {
@@ -164,5 +165,26 @@ describe('test diagnostics', () => {
         validateRange(rangeCalls[0], 0, 0)
       })
     })
+
+    it('should highlight the full line', () => {
+      const mockDiagnostics = new MockDiagnosticCollection()
+      const assertion = createAssertion('a', 'KnownFail')
+      const tests = [createTestResult('f', [assertion])]
+      vscode.Uri.file = jest.fn(() => ({ fsPath: 'f' }))
+      vscode.window.visibleTextEditors = [
+        {
+          document: {
+            lineAt: jest.fn(() => ({
+              firstNonWhitespaceCharacterIndex: 2,
+              text: '  text',
+            })),
+            uri: { fsPath: 'f' },
+          },
+        },
+      ] as any[]
+      updateDiagnostics(tests, mockDiagnostics)
+      expect(vscode.window.visibleTextEditors[0].document.lineAt).toHaveBeenCalled()
+      expect(vscode.Range).toHaveBeenCalledWith(assertion.line - 1, 2, assertion.line - 1, 6)
+    })
   })
 })