fix: Build absolute filePath so problems tab links to error location correctly #4246
Conversation
packages/salesforcedx-vscode-core/src/diagnostics/diagnostics.ts
Outdated
Show resolved
Hide resolved
| const filePath = undefined; | ||
| const asoluteFilePath = getAbsoluteFilePath(filePath, workspacePath); | ||
| expect(asoluteFilePath).to.equal(workspacePath); | ||
| }); |
There was a problem hiding this comment.
I checked out the failing test and I'd just update it to the following:
const [fileDesc, reportedError] = setDiagnosticsStub.getCall(
index
).args;
const expectedFile = vscode.Uri.file(
getAbsoluteFilePath(row.filePath, getRootWorkspacePath())
);
expect(fileDesc).to.deep.equal(expectedFile);
expect(reportedError).to.deep.equal([
{
message: row.error,
range: new vscode.Range(
row.lineNumber - 1,
row.columnNumber - 1,
row.lineNumber - 1,
row.columnNumber - 1
),
severity: vscode.DiagnosticSeverity.Error,
source: row.type
}
]);
lines 457-476
It separates the the assertions so we don't have to run it to know which on is failing. A very uningration solution as it pulls the utility into the test, but it was the best path I could come up with.
There was a problem hiding this comment.
I updated the var names in this method to more closely reflect the params of the method where they are defined.
There was a problem hiding this comment.
Passed my QE:
✅ Verified navigation from problem to file when file is open
✅ Verified navigation from problem to file when file is closed
✅ Verified navigation from problem to file when file is open but not the active editor
✅ Verified when problem is generated during active editing
✅ Verified navigation from problem when the problem is reported after deploy from navigation
✅ Verified navigation from problem to file deploy via Deploy this source to Org
absolute file path is needed to make linking to the problem location work in the problems tab
can this function be refactored/moved to some type of shared file service module?
…esforcedx-vscode into ken/fix-error-file-uri-2
| @@ -511,7 +514,10 @@ describe('Base Deploy Retrieve Commands', () => { | |||
| this.retrieveStub = sb | |||
| .stub(this.components, 'retrieve') | |||
| .returns({ pollStatus: this.pollStatusStub }); | |||
| this.cacheSpy = sb.spy(PersistentStorageService.getInstance(), 'setPropertiesForFilesRetrieve'); | |||
| this.cacheSpy = sb.spy( | |||
There was a problem hiding this comment.
Some auto-formatting refactoring in this file.
…correctly (#4246) * fix: build absolute filePath so problems tab links to error correctly * fix: export new function and add tests * fix: update test to expect absolute file path absolute file path is needed to make linking to the problem location work in the problems tab * fix: default to the root workspace path * fix: add todo can this function be refactored/moved to some type of shared file service module? * refactor: update var names to match parameter names of DiagnosticCollection#set
What does this PR do?
A follow up to PR #4241 to fix the fileUri when constructed after a deployment error.
What issues does this PR fix or reference?
##4228, @W-11350093@