Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #1

Merged
merged 100 commits into from Mar 6, 2018
Merged

Conversation

caseyflynn-google
Copy link
Owner

No description provided.

libingw and others added 30 commits January 8, 2018 10:18
The change to inputManager.js was introduced to fix bug 518735.

See commit 7a4fd80.

Signed-off-by: Remy Suen <remy.suen@gmail.com>
Fix the dependency path to languageServerRegistry.js

Signed-off-by: Remy Suen <remy.suen@gmail.com>
Signed-off-by: Remy Suen <remy.suen@gmail.com>
Signed-off-by: Remy Suen <remy.suen@gmail.com>
Signed-off-by: Remy Suen <remy.suen@gmail.com>
Signed-off-by: Remy Suen <remy.suen@gmail.com>
Signed-off-by: Remy Suen <remy.suen@gmail.com>
This does not include the necessary changes to make the LSP's
CompletionItem's additionalTextEdits work.

The current code in utils.js uses a property named additionalEdits
which conflicts with a property that was created for people extending
Orion to add additional text edits to a completion proposal.

See bug 439272 and bug 527206 comment 14 for more details.

Signed-off-by: Remy Suen <remy.suen@gmail.com>
Signed-off-by: Remy Suen <remy.suen@gmail.com>
Ensure that we can retrieve hover information from MarkedStrings.

Signed-off-by: Remy Suen <remy.suen@gmail.com>
The proposals from a language server were all being set with an
escapePosition field. These were always defined as being the length
of the proposal's text and the code would later perform offset
calculations based on the CompletionItem's textEdit object. However,
if a CompletionItem did not have a textEdit defined, the escape
position would be completely off as it would be relative from zero
instead of from the content that was being replaced by the proposal.

The fix is to remove the property from proposals created from
CompletionItems that don't have a textEdit. This will allow Orion to
calculate and adjust itself to the escape position based on the
replaced text.

Signed-off-by: Remy Suen <remy.suen@gmail.com>
mrennie and others added 29 commits February 22, 2018 14:36
* initial

* re-introduce response-time
Exception /gitapi/tree API (from orion-monitor channel) org-ids/web-ide-issues#950
@caseyflynn-google caseyflynn-google merged commit 3fd5e0e into caseyflynn-google:master Mar 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
8 participants