From 2e03f081d9e1ae1c2ced91689c9af3a7b86804c1 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Wed, 13 Jul 2016 01:56:43 +0900
Subject: [PATCH] (refs #1241) Filter CompletionProposalProvider by the
 completion context

---
 .../core/plugin/CompletionProposalProvider.scala       |  3 +++
 .../twirl/gitbucket/core/helper/attached.scala.html    |  6 +++---
 .../twirl/gitbucket/core/helper/preview.scala.html     | 10 +++++-----
 .../twirl/gitbucket/core/issues/commentform.scala.html |  2 +-
 src/main/twirl/gitbucket/core/issues/create.scala.html |  2 +-
 .../twirl/gitbucket/core/issues/editcomment.scala.html |  2 +-
 .../twirl/gitbucket/core/issues/editissue.scala.html   |  2 +-
 src/main/twirl/gitbucket/core/pulls/compare.scala.html |  2 +-
 .../twirl/gitbucket/core/repo/commentform.scala.html   |  2 +-
 .../twirl/gitbucket/core/repo/editcomment.scala.html   |  2 +-
 src/main/twirl/gitbucket/core/wiki/edit.scala.html     |  2 +-
 11 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/main/scala/gitbucket/core/plugin/CompletionProposalProvider.scala b/src/main/scala/gitbucket/core/plugin/CompletionProposalProvider.scala
index a92e75385..f2d77a4b4 100644
--- a/src/main/scala/gitbucket/core/plugin/CompletionProposalProvider.scala
+++ b/src/main/scala/gitbucket/core/plugin/CompletionProposalProvider.scala
@@ -9,6 +9,7 @@ trait CompletionProposalProvider {
   val prefix: String
   val suffix: String = " "
   val values: Seq[String]
+  val context: Seq[String]
 
   def template(implicit context: Context): String = "value"
   def additionalScript(implicit context: Context): String = ""
@@ -19,6 +20,7 @@ class EmojiCompletionProposalProvider extends CompletionProposalProvider {
   override val values: Seq[String] = EmojiUtil.emojis.toSeq
   override val prefix: String = ":"
   override val suffix: String = ": "
+  override val context: Seq[String] = Seq("wiki", "issues")
   override def template(implicit context: Context): String =
     s"""'<img src=\"${context.path}/assets/common/images/emojis/' + value + '.png\" class=\"emoji\"></img>' + value"""
 }
@@ -27,6 +29,7 @@ class UserCompletionProposalProvider extends CompletionProposalProvider {
   override val id: String = "user"
   override val values: Seq[String] = Nil
   override val prefix: String = "@"
+  override val context: Seq[String] = Seq("issues")
   override def template(implicit context: Context): String = "'@' + value"
   override def additionalScript(implicit context: Context): String =
     s"""$$.get('${context.path}/_user/proposals', { query: '' }, function (data) { user = data.options; });"""
diff --git a/src/main/twirl/gitbucket/core/helper/attached.scala.html b/src/main/twirl/gitbucket/core/helper/attached.scala.html
index d1d555758..4620906b7 100644
--- a/src/main/twirl/gitbucket/core/helper/attached.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/attached.scala.html
@@ -1,4 +1,4 @@
-@(owner: String, repository: String, completion: Seq[String], generateScript: Boolean = true)(textarea: Html)(implicit context: gitbucket.core.controller.Context)
+@(owner: String, repository: String, completionContext: String, generateScript: Boolean = true)(textarea: Html)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.util.{FileUtil, EmojiUtil}
 @import gitbucket.core.view.helpers
 <div class="muted attachable">
@@ -9,14 +9,14 @@
 <script>
 $(function(){
   @gitbucket.core.plugin.PluginRegistry().getCompletionProposalProviders.map { provider =>
-    @if(completion.contains(provider.id)){ // TODO Filter by context
+    @if(provider.context.contains(completionContext)){
       var @provider.id = @Html(helpers.json(provider.values));
       @Html(provider.additionalScript)
     }
   }
   $('#@textareaId').textcomplete([
     @gitbucket.core.plugin.PluginRegistry().getCompletionProposalProviders.map { provider =>
-      @if(completion.contains(provider.id)){ // TODO Filter by context
+      @if(provider.context.contains(completionContext)){
         {
           id: '@{provider.id}',
           match: /\B@{provider.prefix}([\-+\w]*)$/,
diff --git a/src/main/twirl/gitbucket/core/helper/preview.scala.html b/src/main/twirl/gitbucket/core/helper/preview.scala.html
index 1517e17be..52d74c55e 100644
--- a/src/main/twirl/gitbucket/core/helper/preview.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/preview.scala.html
@@ -5,7 +5,7 @@
   enableLineBreaks: Boolean,
   enableTaskList: Boolean,
   hasWritePermission: Boolean,
-  completion: Seq[String],
+  completionContext: String,
   style: String = "",
   styleClass: String = "",
   placeholder: String = "Leave a comment",
@@ -28,10 +28,10 @@
           @if(styleClass.nonEmpty){ class="@styleClass" }>@content</textarea>
       }
       @gitbucket.core.helper.html.attached(
-        owner          = repository.owner,
-        repository     = repository.name,
-        completion     = completion,
-        generateScript = enableWikiLink
+        owner             = repository.owner,
+        repository        = repository.name,
+        completionContext = completionContext,
+        generateScript    = enableWikiLink
       )(textarea)
     </div>
     <div class="tab-pane" id="tab@(uid+1)">
diff --git a/src/main/twirl/gitbucket/core/issues/commentform.scala.html b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
index 02b907645..9f11990b0 100644
--- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
@@ -17,7 +17,7 @@
           enableLineBreaks   = true,
           enableTaskList     = true,
           hasWritePermission = hasWritePermission,
-          completion         = Seq("emoji", "user"),
+          completionContext  = "issues",
           style              = "",
           elastic            = true,
           tabIndex           = 1
diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html
index 8360b4519..e0e606695 100644
--- a/src/main/twirl/gitbucket/core/issues/create.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/create.scala.html
@@ -19,7 +19,7 @@
             enableLineBreaks   = true,
             enableTaskList     = true,
             hasWritePermission = hasWritePermission,
-            completion         = Seq("emoji", "user"),
+            completionContext  = "issues",
             style              = "height: 200px; max-height: 250px;",
             elastic            = true
           )
diff --git a/src/main/twirl/gitbucket/core/issues/editcomment.scala.html b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html
index bc4e64b7d..da96b9c32 100644
--- a/src/main/twirl/gitbucket/core/issues/editcomment.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html
@@ -1,6 +1,6 @@
 @(content: String, commentId: Int, owner: String, repository: String)(implicit context: gitbucket.core.controller.Context)
 <span id="error-edit-content-@commentId" class="error"></span>
-@gitbucket.core.helper.html.attached(owner, repository, completion = Seq("emoji", "user")){
+@gitbucket.core.helper.html.attached(owner, repository, "issues"){
   <textarea id="edit-content-@commentId" class="form-control">@content</textarea>
 }
 <div>
diff --git a/src/main/twirl/gitbucket/core/issues/editissue.scala.html b/src/main/twirl/gitbucket/core/issues/editissue.scala.html
index de64dbd96..257aa6780 100644
--- a/src/main/twirl/gitbucket/core/issues/editissue.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/editissue.scala.html
@@ -1,5 +1,5 @@
 @(content: Option[String], issueId: Int, owner: String, repository: String)(implicit context: gitbucket.core.controller.Context)
-@gitbucket.core.helper.html.attached(owner, repository, Seq("emoji", "user")){
+@gitbucket.core.helper.html.attached(owner, repository, "issues"){
   <textarea id="edit-content" class="form-control">@content.getOrElse("")</textarea>
 }
 <div>
diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
index bb439fb69..00a619527 100644
--- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
@@ -65,7 +65,7 @@
                 enableLineBreaks   = true,
                 enableTaskList     = true,
                 hasWritePermission = true,
-                completion         = Seq("emoji", "user"),
+                completionContext  = "issues",
                 style              = "height: 200px;"
               )
               <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
diff --git a/src/main/twirl/gitbucket/core/repo/commentform.scala.html b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
index 8524b5ecf..9730966ec 100644
--- a/src/main/twirl/gitbucket/core/repo/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
@@ -22,7 +22,7 @@
           enableLineBreaks   = true,
           enableTaskList     = true,
           hasWritePermission = hasWritePermission,
-          completion         = Seq("emoji", "user"),
+          completionContext  = "issues",
           style              = "height: 100px; max-height: 150px;",
           elastic            = true
         )
diff --git a/src/main/twirl/gitbucket/core/repo/editcomment.scala.html b/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
index fdc866232..f2787825f 100644
--- a/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/editcomment.scala.html
@@ -1,6 +1,6 @@
 @(content: String, commentId: Int, owner: String, repository: String)(implicit context: gitbucket.core.controller.Context)
 <span class="error-edit-content-@commentId error"></span>
-@gitbucket.core.helper.html.attached(owner, repository, Seq("emoji", "user")){
+@gitbucket.core.helper.html.attached(owner, repository, "issues"){
   <textarea style="height: 100px;" id="edit-content-@commentId" class="form-control">@content</textarea>
 }
 <div>
diff --git a/src/main/twirl/gitbucket/core/wiki/edit.scala.html b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
index 3089dfc0a..5a0dc7db5 100644
--- a/src/main/twirl/gitbucket/core/wiki/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
@@ -25,7 +25,7 @@
           enableLineBreaks   = false,
           enableTaskList     = false,
           hasWritePermission = false,
-          completion         = Seq("emoji"),
+          completionContext  = "wiki",
           style              = "height: 400px;",
           styleClass         = "monospace",
           placeholder        = "",