Add source mappings for serialized properties with available declaration #60005
Conversation
typescript-bot
added
the
For Uncommitted Bug
typescript-bot
added
For Backlog Bug
| const folder = this.getRealFolder(base); | ||
| // this line can throw on purpose, don't use Debug.assert to avoid redundant debugger hits | ||
| // eslint-disable-next-line no-restricted-syntax | ||
| if (folder === null || folder === undefined) { | ||
| throw new Error(`Directory not found: ${base}`); | ||
| } |
There was a problem hiding this comment.
Do you mind sending this as a separate change; I've been wanting to do this for a while so would be nice to get in regardless of the status of this PR.
No need to leave the comment, and I suspect that a plain truthiness check is fine too.
| openFilesForSession([mainTs], session); | ||
| session.executeCommandSeq<ts.server.protocol.DefinitionAndBoundSpanRequest>({ | ||
| command: ts.server.protocol.CommandTypes.DefinitionAndBoundSpan, | ||
| arguments: { file: mainTs.path, line: 3, offset: "caller.foo".length - 2 }, |
There was a problem hiding this comment.
Pls use protocolFileLocationFromSubstring to get line and offset
src/compiler/checker.ts
Outdated
| const propertyName = getPropertyNameNodeForSymbol(propertySymbol, context); | ||
| if (propertyDeclaration && (isPropertyAssignment(propertyDeclaration) || isShorthandPropertyAssignment(propertyDeclaration) || isMethodDeclaration(propertyDeclaration) || isMethodSignature(propertyDeclaration) || isPropertySignature(propertyDeclaration) || isPropertyDeclaration(propertyDeclaration) || isGetOrSetAccessorDeclaration(propertyDeclaration))) { | ||
| setSourceMapRange(propertyName, propertyDeclaration.name); |
There was a problem hiding this comment.
I still feel at least a little uncomfortable with this; why isn't it declaration emit which can do this? The node builder produces lots of nodes, why doesn't this happen elsewhere?
There was a problem hiding this comment.
Also, can this just be done in getPropertyNameNodeForSymbol?
(In any case, this PR is safe, since getPropertyNameNodeForSymbol is returning a new node.)
There was a problem hiding this comment.
I still feel at least a little uncomfortable with this; why isn't it declaration emit which can do this?
the required information is on the symbol, emit works based on the produced nodes and we need to pass somehow the information that it needs from here as this is the place where this information is being lost. This just leaves a breadcrumb that can be picked up by the emitter
Also, can this just be done in getPropertyNameNodeForSymbol?
maybe, im not sure sure ;p I'll try to analyze this
src/compiler/checker.ts
Outdated
| const propertyName = getPropertyNameNodeForSymbol(propertySymbol, context); | ||
| if (propertyDeclaration && (isPropertyAssignment(propertyDeclaration) || isShorthandPropertyAssignment(propertyDeclaration) || isMethodDeclaration(propertyDeclaration) || isMethodSignature(propertyDeclaration) || isPropertySignature(propertyDeclaration) || isPropertyDeclaration(propertyDeclaration) || isGetOrSetAccessorDeclaration(propertyDeclaration))) { | ||
| setSourceMapRange(propertyName, propertyDeclaration.name); |
There was a problem hiding this comment.
For declaration emit nodes, just use setTextRange rather than setSourceMapRange - there's a helper in scope that takes care of a bunch of sanity checking for you that's absent here. But yeah, you should also be able to move this into getPropertyNameNodeForSymbol so it happens for all callers.
There was a problem hiding this comment.
Using setTextRange doesn't cut it and the results are as on the main branch. Am I using it wrong or missing something?
I have moved the fix to getPropertyNameNodeForSymbol though
fixes #60004