{"action":"created","comment":{"url":"https://api.github.com/repos/theia-ide/theia/pulls/comments/166978742","pull_request_review_id":95126300,"id":166978742,"diff_hunk":"@@ -0,0 +1,81 @@\n+/*\n+ * Copyright (C) 2017 TypeFox and others.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0\n+ */\n+\n+import { injectable, inject } from \"inversify\";\n+import { Range } from \"./editor\";\n+import { EditorManager } from \"./editor-manager\";\n+import URI from \"@theia/core/lib/common/uri\";\n+\n+export const EditorDecorationsService = Symbol('EditorDecorationsService');\n+\n+export interface EditorDecorationsService {\n+    registerDecorationType(decorationType: DecorationType): void;\n+    removeDecorationType(key: string): void;\n+    getDecorationTypes(): DecorationType[];\n+    setDecorations(uri: URI, key: string, decorations: DecorationOptions[]): void;","path":"packages/editor/src/browser/editor-decoration.ts","position":19,"original_position":19,"commit_id":"6e6e2171f78f6a74e28b8de84cd354719e059e3f","original_commit_id":"6e6e2171f78f6a74e28b8de84cd354719e059e3f","user":{"login":"akosyakov","id":3082655,"avatar_url":"https://avatars2.githubusercontent.com/u/3082655?v=4","gravatar_id":"","url":"https://api.github.com/users/akosyakov","html_url":"https://github.com/akosyakov","followers_url":"https://api.github.com/users/akosyakov/followers","following_url":"https://api.github.com/users/akosyakov/following{/other_user}","gists_url":"https://api.github.com/users/akosyakov/gists{/gist_id}","starred_url":"https://api.github.com/users/akosyakov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/akosyakov/subscriptions","organizations_url":"https://api.github.com/users/akosyakov/orgs","repos_url":"https://api.github.com/users/akosyakov/repos","events_url":"https://api.github.com/users/akosyakov/events{/privacy}","received_events_url":"https://api.github.com/users/akosyakov/received_events","type":"User","site_admin":false},"body":"it should return `Disposable` i assume to return decorations","created_at":"2018-02-08T15:54:37Z","updated_at":"2018-02-08T15:54:38Z","html_url":"https://github.com/theia-ide/theia/pull/1231#discussion_r166978742","pull_request_url":"https://api.github.com/repos/theia-ide/theia/pulls/1231","author_association":"OWNER","_links":{"self":{"href":"https://api.github.com/repos/theia-ide/theia/pulls/comments/166978742"},"html":{"href":"https://github.com/theia-ide/theia/pull/1231#discussion_r166978742"},"pull_request":{"href":"https://api.github.com/repos/theia-ide/theia/pulls/1231"}}},"pull_request":{"url":"https://api.github.com/repos/theia-ide/theia/pulls/1231","id":167922687,"html_url":"https://github.com/theia-ide/theia/pull/1231","diff_url":"https://github.com/theia-ide/theia/pull/1231.diff","patch_url":"https://github.com/theia-ide/theia/pull/1231.patch","issue_url":"https://api.github.com/repos/theia-ide/theia/issues/1231","number":1231,"state":"open","locked":false,"title":"[WIP] Merge Conflicts Code Lense ","user":{"login":"AlexTugarev","id":914497,"avatar_url":"https://avatars3.githubusercontent.com/u/914497?v=4","gravatar_id":"","url":"https://api.github.com/users/AlexTugarev","html_url":"https://github.com/AlexTugarev","followers_url":"https://api.github.com/users/AlexTugarev/followers","following_url":"https://api.github.com/users/AlexTugarev/following{/other_user}","gists_url":"https://api.github.com/users/AlexTugarev/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexTugarev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexTugarev/subscriptions","organizations_url":"https://api.github.com/users/AlexTugarev/orgs","repos_url":"https://api.github.com/users/AlexTugarev/repos","events_url":"https://api.github.com/users/AlexTugarev/events{/privacy}","received_events_url":"https://api.github.com/users/AlexTugarev/received_events","type":"User","site_admin":false},"body":"This change set adds code lenses for merge conflicts. \r\n- Merge conflicts should be decorated in editor.\r\n- Commands of code lenses should help to accept changes.\r\n\r\nOpen task:\r\n- [ ] in git view we might better show the code editor when a file with conflicts is opened.\r\n- [ ] diff editor should show merge conflict decorators.\r\n code lenses OTOH are not intended to be added to the editor. \r\n- [ ] merge conflict decorators should be optional, consider editor preference.\r\n- [ ] if required, we could add another code lense command to show the conflict in diff editor.\r\n- [ ] if required, we could add commands to accept same resolution for all merge conflicts in current editor.\r\n\r\nPreview: \r\n![2018-02-08 10 43 45](https://user-images.githubusercontent.com/914497/35966054-0871308e-0cbd-11e8-9252-ca80e27e2563.gif)\r\n","created_at":"2018-02-08T09:51:27Z","updated_at":"2018-02-08T15:54:38Z","closed_at":null,"merged_at":null,"merge_commit_sha":"91de4eb7afd477f9f07e11d33dda2bc12d32f4a2","assignee":null,"assignees":[],"requested_reviewers":[{"login":"svenefftinge","id":372735,"avatar_url":"https://avatars0.githubusercontent.com/u/372735?v=4","gravatar_id":"","url":"https://api.github.com/users/svenefftinge","html_url":"https://github.com/svenefftinge","followers_url":"https://api.github.com/users/svenefftinge/followers","following_url":"https://api.github.com/users/svenefftinge/following{/other_user}","gists_url":"https://api.github.com/users/svenefftinge/gists{/gist_id}","starred_url":"https://api.github.com/users/svenefftinge/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/svenefftinge/subscriptions","organizations_url":"https://api.github.com/users/svenefftinge/orgs","repos_url":"https://api.github.com/users/svenefftinge/repos","events_url":"https://api.github.com/users/svenefftinge/events{/privacy}","received_events_url":"https://api.github.com/users/svenefftinge/received_events","type":"User","site_admin":false}],"requested_teams":[],"milestone":null,"commits_url":"https://api.github.com/repos/theia-ide/theia/pulls/1231/commits","review_comments_url":"https://api.github.com/repos/theia-ide/theia/pulls/1231/comments","review_comment_url":"https://api.github.com/repos/theia-ide/theia/pulls/comments{/number}","comments_url":"https://api.github.com/repos/theia-ide/theia/issues/1231/comments","statuses_url":"https://api.github.com/repos/theia-ide/theia/statuses/6e6e2171f78f6a74e28b8de84cd354719e059e3f","head":{"label":"theia-ide:at/merge-conflicts-extension","ref":"at/merge-conflicts-extension","sha":"6e6e2171f78f6a74e28b8de84cd354719e059e3f","user":{"login":"theia-ide","id":28530323,"avatar_url":"https://avatars1.githubusercontent.com/u/28530323?v=4","gravatar_id":"","url":"https://api.github.com/users/theia-ide","html_url":"https://github.com/theia-ide","followers_url":"https://api.github.com/users/theia-ide/followers","following_url":"https://api.github.com/users/theia-ide/following{/other_user}","gists_url":"https://api.github.com/users/theia-ide/gists{/gist_id}","starred_url":"https://api.github.com/users/theia-ide/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/theia-ide/subscriptions","organizations_url":"https://api.github.com/users/theia-ide/orgs","repos_url":"https://api.github.com/users/theia-ide/repos","events_url":"https://api.github.com/users/theia-ide/events{/privacy}","received_events_url":"https://api.github.com/users/theia-ide/received_events","type":"Organization","site_admin":false},"repo":{"id":83050680,"name":"theia","full_name":"theia-ide/theia","owner":{"login":"theia-ide","id":28530323,"avatar_url":"https://avatars1.githubusercontent.com/u/28530323?v=4","gravatar_id":"","url":"https://api.github.com/users/theia-ide","html_url":"https://github.com/theia-ide","followers_url":"https://api.github.com/users/theia-ide/followers","following_url":"https://api.github.com/users/theia-ide/following{/other_user}","gists_url":"https://api.github.com/users/theia-ide/gists{/gist_id}","starred_url":"https://api.github.com/users/theia-ide/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/theia-ide/subscriptions","organizations_url":"https://api.github.com/users/theia-ide/orgs","repos_url":"https://api.github.com/users/theia-ide/repos","events_url":"https://api.github.com/users/theia-ide/events{/privacy}","received_events_url":"https://api.github.com/users/theia-ide/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/theia-ide/theia","description":"Theia is a cloud & desktop IDE framework implemented in TypeScript.","fork":false,"url":"https://api.github.com/repos/theia-ide/theia","forks_url":"https://api.github.com/repos/theia-ide/theia/forks","keys_url":"https://api.github.com/repos/theia-ide/theia/keys{/key_id}","collaborators_url":"https://api.github.com/repos/theia-ide/theia/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/theia-ide/theia/teams","hooks_url":"https://api.github.com/repos/theia-ide/theia/hooks","issue_events_url":"https://api.github.com/repos/theia-ide/theia/issues/events{/number}","events_url":"https://api.github.com/repos/theia-ide/theia/events","assignees_url":"https://api.github.com/repos/theia-ide/theia/assignees{/user}","branches_url":"https://api.github.com/repos/theia-ide/theia/branches{/branch}","tags_url":"https://api.github.com/repos/theia-ide/theia/tags","blobs_url":"https://api.github.com/repos/theia-ide/theia/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/theia-ide/theia/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/theia-ide/theia/git/refs{/sha}","trees_url":"https://api.github.com/repos/theia-ide/theia/git/trees{/sha}","statuses_url":"https://api.github.com/repos/theia-ide/theia/statuses/{sha}","languages_url":"https://api.github.com/repos/theia-ide/theia/languages","stargazers_url":"https://api.github.com/repos/theia-ide/theia/stargazers","contributors_url":"https://api.github.com/repos/theia-ide/theia/contributors","subscribers_url":"https://api.github.com/repos/theia-ide/theia/subscribers","subscription_url":"https://api.github.com/repos/theia-ide/theia/subscription","commits_url":"https://api.github.com/repos/theia-ide/theia/commits{/sha}","git_commits_url":"https://api.github.com/repos/theia-ide/theia/git/commits{/sha}","comments_url":"https://api.github.com/repos/theia-ide/theia/comments{/number}","issue_comment_url":"https://api.github.com/repos/theia-ide/theia/issues/comments{/number}","contents_url":"https://api.github.com/repos/theia-ide/theia/contents/{+path}","compare_url":"https://api.github.com/repos/theia-ide/theia/compare/{base}...{head}","merges_url":"https://api.github.com/repos/theia-ide/theia/merges","archive_url":"https://api.github.com/repos/theia-ide/theia/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/theia-ide/theia/downloads","issues_url":"https://api.github.com/repos/theia-ide/theia/issues{/number}","pulls_url":"https://api.github.com/repos/theia-ide/theia/pulls{/number}","milestones_url":"https://api.github.com/repos/theia-ide/theia/milestones{/number}","notifications_url":"https://api.github.com/repos/theia-ide/theia/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/theia-ide/theia/labels{/name}","releases_url":"https://api.github.com/repos/theia-ide/theia/releases{/id}","deployments_url":"https://api.github.com/repos/theia-ide/theia/deployments","created_at":"2017-02-24T14:42:05Z","updated_at":"2018-02-08T15:40:40Z","pushed_at":"2018-02-08T15:40:05Z","git_url":"git://github.com/theia-ide/theia.git","ssh_url":"git@github.com:theia-ide/theia.git","clone_url":"https://github.com/theia-ide/theia.git","svn_url":"https://github.com/theia-ide/theia","homepage":"","size":69211,"stargazers_count":516,"watchers_count":516,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":90,"mirror_url":null,"archived":false,"open_issues_count":273,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0"},"forks":90,"open_issues":273,"watchers":516,"default_branch":"master"}},"base":{"label":"theia-ide:master","ref":"master","sha":"9785265d49010cc4bdbbf1b10a03b38995d866de","user":{"login":"theia-ide","id":28530323,"avatar_url":"https://avatars1.githubusercontent.com/u/28530323?v=4","gravatar_id":"","url":"https://api.github.com/users/theia-ide","html_url":"https://github.com/theia-ide","followers_url":"https://api.github.com/users/theia-ide/followers","following_url":"https://api.github.com/users/theia-ide/following{/other_user}","gists_url":"https://api.github.com/users/theia-ide/gists{/gist_id}","starred_url":"https://api.github.com/users/theia-ide/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/theia-ide/subscriptions","organizations_url":"https://api.github.com/users/theia-ide/orgs","repos_url":"https://api.github.com/users/theia-ide/repos","events_url":"https://api.github.com/users/theia-ide/events{/privacy}","received_events_url":"https://api.github.com/users/theia-ide/received_events","type":"Organization","site_admin":false},"repo":{"id":83050680,"name":"theia","full_name":"theia-ide/theia","owner":{"login":"theia-ide","id":28530323,"avatar_url":"https://avatars1.githubusercontent.com/u/28530323?v=4","gravatar_id":"","url":"https://api.github.com/users/theia-ide","html_url":"https://github.com/theia-ide","followers_url":"https://api.github.com/users/theia-ide/followers","following_url":"https://api.github.com/users/theia-ide/following{/other_user}","gists_url":"https://api.github.com/users/theia-ide/gists{/gist_id}","starred_url":"https://api.github.com/users/theia-ide/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/theia-ide/subscriptions","organizations_url":"https://api.github.com/users/theia-ide/orgs","repos_url":"https://api.github.com/users/theia-ide/repos","events_url":"https://api.github.com/users/theia-ide/events{/privacy}","received_events_url":"https://api.github.com/users/theia-ide/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/theia-ide/theia","description":"Theia is a cloud & desktop IDE framework implemented in TypeScript.","fork":false,"url":"https://api.github.com/repos/theia-ide/theia","forks_url":"https://api.github.com/repos/theia-ide/theia/forks","keys_url":"https://api.github.com/repos/theia-ide/theia/keys{/key_id}","collaborators_url":"https://api.github.com/repos/theia-ide/theia/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/theia-ide/theia/teams","hooks_url":"https://api.github.com/repos/theia-ide/theia/hooks","issue_events_url":"https://api.github.com/repos/theia-ide/theia/issues/events{/number}","events_url":"https://api.github.com/repos/theia-ide/theia/events","assignees_url":"https://api.github.com/repos/theia-ide/theia/assignees{/user}","branches_url":"https://api.github.com/repos/theia-ide/theia/branches{/branch}","tags_url":"https://api.github.com/repos/theia-ide/theia/tags","blobs_url":"https://api.github.com/repos/theia-ide/theia/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/theia-ide/theia/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/theia-ide/theia/git/refs{/sha}","trees_url":"https://api.github.com/repos/theia-ide/theia/git/trees{/sha}","statuses_url":"https://api.github.com/repos/theia-ide/theia/statuses/{sha}","languages_url":"https://api.github.com/repos/theia-ide/theia/languages","stargazers_url":"https://api.github.com/repos/theia-ide/theia/stargazers","contributors_url":"https://api.github.com/repos/theia-ide/theia/contributors","subscribers_url":"https://api.github.com/repos/theia-ide/theia/subscribers","subscription_url":"https://api.github.com/repos/theia-ide/theia/subscription","commits_url":"https://api.github.com/repos/theia-ide/theia/commits{/sha}","git_commits_url":"https://api.github.com/repos/theia-ide/theia/git/commits{/sha}","comments_url":"https://api.github.com/repos/theia-ide/theia/comments{/number}","issue_comment_url":"https://api.github.com/repos/theia-ide/theia/issues/comments{/number}","contents_url":"https://api.github.com/repos/theia-ide/theia/contents/{+path}","compare_url":"https://api.github.com/repos/theia-ide/theia/compare/{base}...{head}","merges_url":"https://api.github.com/repos/theia-ide/theia/merges","archive_url":"https://api.github.com/repos/theia-ide/theia/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/theia-ide/theia/downloads","issues_url":"https://api.github.com/repos/theia-ide/theia/issues{/number}","pulls_url":"https://api.github.com/repos/theia-ide/theia/pulls{/number}","milestones_url":"https://api.github.com/repos/theia-ide/theia/milestones{/number}","notifications_url":"https://api.github.com/repos/theia-ide/theia/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/theia-ide/theia/labels{/name}","releases_url":"https://api.github.com/repos/theia-ide/theia/releases{/id}","deployments_url":"https://api.github.com/repos/theia-ide/theia/deployments","created_at":"2017-02-24T14:42:05Z","updated_at":"2018-02-08T15:40:40Z","pushed_at":"2018-02-08T15:40:05Z","git_url":"git://github.com/theia-ide/theia.git","ssh_url":"git@github.com:theia-ide/theia.git","clone_url":"https://github.com/theia-ide/theia.git","svn_url":"https://github.com/theia-ide/theia","homepage":"","size":69211,"stargazers_count":516,"watchers_count":516,"language":"TypeScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":90,"mirror_url":null,"archived":false,"open_issues_count":273,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0"},"forks":90,"open_issues":273,"watchers":516,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/theia-ide/theia/pulls/1231"},"html":{"href":"https://github.com/theia-ide/theia/pull/1231"},"issue":{"href":"https://api.github.com/repos/theia-ide/theia/issues/1231"},"comments":{"href":"https://api.github.com/repos/theia-ide/theia/issues/1231/comments"},"review_comments":{"href":"https://api.github.com/repos/theia-ide/theia/pulls/1231/comments"},"review_comment":{"href":"https://api.github.com/repos/theia-ide/theia/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/theia-ide/theia/pulls/1231/commits"},"statuses":{"href":"https://api.github.com/repos/theia-ide/theia/statuses/6e6e2171f78f6a74e28b8de84cd354719e059e3f"}},"author_association":"MEMBER"}}
{"actor":{"display_login":"akosyakov"}}