Skip to content
This repository was archived by the owner on Nov 5, 2021. It is now read-only.

Updates to support the TS 3.6.0 beta, and adds a daily run-script #36

Merged
alexdima merged 11 commits intomicrosoft:masterfrom
orta:_360b
Aug 30, 2019
Merged

Updates to support the TS 3.6.0 beta, and adds a daily run-script #36
alexdima merged 11 commits intomicrosoft:masterfrom
orta:_360b

Conversation

@orta
Copy link
Contributor

@orta orta commented Jul 24, 2019

  • ts.DiagnosticMessageChain now supports nested diagnostics, so I moved over the new function from TS.
  • Includes Adds new enum values for ts 3.6 #35 - which I'll close
  • Adds a script for updating the version to a daily build from the TS daily build

@orta
Copy link
Contributor Author

orta commented Jul 25, 2019

This is currently blocked because I can't add a pipeline to this repo, so I applied to join the vscode team in the ms GitHub org yesterday

@orta
Copy link
Contributor Author

orta commented Jul 31, 2019

OK, I've verified this on my own pipelines to be working 👍

I'd need to re-create the pipelines on this repo, and add an NPM token to the environment after this is merged.

@alexdima alexdima self-requested a review August 13, 2019 17:06
Copy link
Member

@alexdima alexdima left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get a compile error in languageFeatures.ts. It looks like the code is written against TS 3.6, but in package.json we still ask for TS ^3.5.1, so is there a way to write languageFeatures.ts in a way which works against both versions?

image

@orta
Copy link
Contributor Author

orta commented Aug 16, 2019

Ah yeah, I remember now, I didn't want to have to send along all of the changes of TypeScript 3.6 in this PR when it was still in a beta phase - and so I didn't ship the package.json change.

The RC should be today, so I'm happy to have that happen once that that's shipped. I can give it a shot at handling both forms of diagnostics but it's probably not worth it given that it will only be used with 3.6+ form here on out

Copy link
Contributor Author

@orta orta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, this is ready to go with the 3.6 release 👍

const beforeProcess = `ts.perfLogger.logInfoEvent("Starting TypeScript v" + ts.versionMajorMinor + " with command line: " + JSON.stringify(process.argv));`
const afterProcess = `// MONACOCHANGE\n ts.perfLogger.logInfoEvent("Starting TypeScript v" + ts.versionMajorMinor + " with command line: " + JSON.stringify([]));\n// END MONACOCHANGE`
tsServices = tsServices.replace(beforeProcess, afterProcess);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm about to send a TS PR to fix this upstream also 👍

}
result += diagnosticChain.messageText;
indent++;
diagnosticChain = diagnosticChain.next;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This retains the backwards compatibility with 3.5 and below ( by just using an any and keeping the original logic if the next isn't utterable (here's a screenshot of it in 3.5 still chaining correctly )

Screen Shot 2019-08-29 at 12 29 33 PM

Copy link
Contributor

@mjbvz mjbvz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@alexandrudima Is having a daily build of this published good with you?

…escript it ships and reflects its own API surface
…escript it ships and reflects its own API surface
@alexdima
Copy link
Member

  1. The version of monaco-typescript in package.json is in no way related to the version of TypeScript it ships.

  2. Sorry for not explaining clearer. While TS 3.6 was in beta, I could not accept the changes unless the changes covered TS 3.5. Now that TS 3.6 is released (and adopted via package.json), we don't need to have TS 3.5 compatibility.

@alexdima alexdima merged commit c9f75d5 into microsoft:master Aug 30, 2019
@alexdima
Copy link
Member

Thank you! ❤️

@orta
Copy link
Contributor Author

orta commented Aug 30, 2019

Thank you!

@alexdima alexdima added this to the August 2019 milestone Sep 19, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants