Skip to content

Convert all values of MarkerSeverity in the converter - #71

Merged
rcjsuen merged 1 commit into
TypeFox:masterfrom
rcjsuen:hint
Apr 18, 2018
Merged

Convert all values of MarkerSeverity in the converter#71
rcjsuen merged 1 commit into
TypeFox:masterfrom
rcjsuen:hint

Conversation

@rcjsuen

@rcjsuen rcjsuen commented Apr 18, 2018

Copy link
Copy Markdown
Contributor

It seems that monaco.MarkerSeverity.Hint is not being considered when converting a Monaco marker to an LSP Diagnostic so I fixed the converter.

asDiagnosticSeverity(value: monaco.MarkerSeverity): DiagnosticSeverity | undefined {
switch (value) {
case monaco.MarkerSeverity.Error:
return DiagnosticSeverity.Error;
case monaco.MarkerSeverity.Warning:
return DiagnosticSeverity.Warning;
case monaco.MarkerSeverity.Info:
return DiagnosticSeverity.Information;
}
return undefined;
}

Fixed the switch statement so that it would convert
MarkerSeverity.Hint to DiagnosticSeverity.Hint.

Signed-off-by: Remy Suen <remy.suen@gmail.com>
@akosyakov
akosyakov requested a review from AlexTugarev April 18, 2018 11:05

@AlexTugarev AlexTugarev left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM!

@AlexTugarev

Copy link
Copy Markdown
Contributor

@rcjsuen, I'm not sure about the change logs and the next release. I think, I'll add a change and do a 0.6.0 release if there are not objections. As @akosyakov mentioned currently published latest is published by accident.

@rcjsuen
rcjsuen merged commit 2827b95 into TypeFox:master Apr 18, 2018
@rcjsuen
rcjsuen deleted the hint branch April 18, 2018 11:44
@rcjsuen

rcjsuen commented Apr 18, 2018

Copy link
Copy Markdown
Contributor Author

Thanks for the review, @AlexTugarev. I've merged the changes into master.

If you want to just version the next release 0.6.0 then feel free. I don't have any issues with that. Perhaps we can just skip over 0.5.0 in the changelog too then in that case.

Here's a diff of what I think needs to be done.

  1. Replace 'Unreleased' with '0.6.0' obviously. When work on the next release begins we can add an 'Unreleased' section back. Alternatively, you can of course keep it and just append a new '0.6.0' section header to "replace" it. Whatever works for you.

  2. Change the dependency update to 0.12 instead of 0.11.

  3. Replace the link at the bottom to diff the v0.4.0 tag and the (to-be-created) v0.6.0 tag.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 000e43b..d27523c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
-- updated dependency to Monaco 0.11 ([#61](https://github.com/TypeFox/monaco-languageclient/issues/61))
+## [0.6.0] - 2018-04-18
+- updated dependency to Monaco 0.12 ([#70](https://github.com/TypeFox/monaco-languageclient/pull/70))
 - support `CompletionItem`'s `additionalTextEdits` property ([#39](https://github.com/TypeFox/monaco-languageclient/issues/39))
 - convert `monaco.MarkerSeverity.Hint` values to `DiagnosticSeverity.Hint` ([#71](https://github.com/TypeFox/monaco-languageclient/pull/71))
 
@@ -29,7 +29,7 @@ All notable changes to this project will be documented in this file.
 ## 0.1.0 - 2017-0
 - initial 0.1.0 release, depends on Monaco 0.9.0
 
-[Unreleased]: https://github.com/TypeFox/monaco-languageclient/compare/v0.4.0...HEAD
+[0.6.0]: https://github.com/TypeFox/monaco-languageclient/compare/v0.4.0...v0.6.0
 [0.4.0]: https://github.com/TypeFox/monaco-languageclient/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/TypeFox/monaco-languageclient/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/TypeFox/monaco-languageclient/compare/v0.2.0...v0.2.1

@AlexTugarev

Copy link
Copy Markdown
Contributor

That's very kind of you, @rcjsuen! Thanks! Will do so.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants