From d67afebadcdd672f9a3199f9830d91839a713b5d Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sat, 16 Jul 2016 12:29:42 +0900
Subject: [PATCH] Rename CompletionProposalProvider to SuggestionProvider

---
 src/main/scala/gitbucket/core/plugin/Plugin.scala    | 12 ++++++------
 .../gitbucket/core/plugin/PluginRegistory.scala      |  8 ++++----
 ...oposalProvider.scala => SuggestionProvider.scala} |  4 ++--
 .../twirl/gitbucket/core/helper/attached.scala.html  |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename src/main/scala/gitbucket/core/plugin/{CompletionProposalProvider.scala => SuggestionProvider.scala} (88%)

diff --git a/src/main/scala/gitbucket/core/plugin/Plugin.scala b/src/main/scala/gitbucket/core/plugin/Plugin.scala
index f115f50c8..dd3fcb0c9 100644
--- a/src/main/scala/gitbucket/core/plugin/Plugin.scala
+++ b/src/main/scala/gitbucket/core/plugin/Plugin.scala
@@ -170,14 +170,14 @@ abstract class Plugin {
   def textDecorators(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[TextDecorator] = Nil
 
   /**
-   * Override to add completion proposal provider.
+   * Override to add suggestion provider.
    */
-  val completionProposalProviders: Seq[CompletionProposalProvider] = Nil
+  val suggestionProviders: Seq[SuggestionProvider] = Nil
 
   /**
-   * Override to add completion proposal provider.
+   * Override to add suggestion provider.
    */
-  def completionProposalProviders(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[CompletionProposalProvider] = Nil
+  def suggestionProviders(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[SuggestionProvider] = Nil
 
   /**
    * This method is invoked in initialization of plugin system.
@@ -229,8 +229,8 @@ abstract class Plugin {
     (textDecorators ++ textDecorators(registry, context, settings)).foreach { textDecorator =>
       registry.addTextDecorator(textDecorator)
     }
-    (completionProposalProviders ++ completionProposalProviders(registry, context, settings)).foreach { completionProposalProvider =>
-      registry.addCompletionProposalProvider(completionProposalProvider)
+    (suggestionProviders ++ suggestionProviders(registry, context, settings)).foreach { suggestionProvider =>
+      registry.addSuggestionProvider(suggestionProvider)
     }
   }
 
diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
index c1fcf96f0..7de95030f 100644
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
@@ -44,8 +44,8 @@ class PluginRegistry {
   private val assetsMappings = new ListBuffer[(String, String, ClassLoader)]
   private val textDecorators = new ListBuffer[TextDecorator]
 
-  private val completionProposalProviders = new ListBuffer[CompletionProposalProvider]
-  completionProposalProviders += new UserCompletionProposalProvider()
+  private val suggestionProviders = new ListBuffer[SuggestionProvider]
+  suggestionProviders += new UserNameSuggestionProvider()
 
   def addPlugin(pluginInfo: PluginInfo): Unit = plugins += pluginInfo
 
@@ -137,9 +137,9 @@ class PluginRegistry {
 
   def getTextDecorators: Seq[TextDecorator] = textDecorators.toSeq
 
-  def addCompletionProposalProvider(completionProposalProvider: CompletionProposalProvider): Unit = completionProposalProviders += completionProposalProvider
+  def addSuggestionProvider(suggestionProvider: SuggestionProvider): Unit = suggestionProviders += suggestionProvider
 
-  def getCompletionProposalProviders: Seq[CompletionProposalProvider] = completionProposalProviders.toSeq
+  def getSuggestionProviders: Seq[SuggestionProvider] = suggestionProviders.toSeq
 }
 
 /**
diff --git a/src/main/scala/gitbucket/core/plugin/CompletionProposalProvider.scala b/src/main/scala/gitbucket/core/plugin/SuggestionProvider.scala
similarity index 88%
rename from src/main/scala/gitbucket/core/plugin/CompletionProposalProvider.scala
rename to src/main/scala/gitbucket/core/plugin/SuggestionProvider.scala
index 26f918e97..95b9bbc6c 100644
--- a/src/main/scala/gitbucket/core/plugin/CompletionProposalProvider.scala
+++ b/src/main/scala/gitbucket/core/plugin/SuggestionProvider.scala
@@ -3,7 +3,7 @@ package gitbucket.core.plugin
 import gitbucket.core.controller.Context
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 
-trait CompletionProposalProvider {
+trait SuggestionProvider {
 
   val id: String
   val prefix: String
@@ -16,7 +16,7 @@ trait CompletionProposalProvider {
 
 }
 
-class UserCompletionProposalProvider extends CompletionProposalProvider {
+class UserNameSuggestionProvider extends SuggestionProvider {
   override val id: String = "user"
   override val prefix: String = "@"
   override val context: Seq[String] = Seq("issues")
diff --git a/src/main/twirl/gitbucket/core/helper/attached.scala.html b/src/main/twirl/gitbucket/core/helper/attached.scala.html
index 0571b7d05..9bea4f14d 100644
--- a/src/main/twirl/gitbucket/core/helper/attached.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/attached.scala.html
@@ -9,14 +9,14 @@
 @defining("(id=\")([\\w\\-]*)(\")".r.findFirstMatchIn(textarea.body).map(_.group(2))){ textareaId =>
 <script>
 $(function(){
-  @gitbucket.core.plugin.PluginRegistry().getCompletionProposalProviders.map { provider =>
+  @gitbucket.core.plugin.PluginRegistry().getSuggestionProviders.map { provider =>
     @if(provider.context.contains(completionContext)){
       var @provider.id = @Html(helpers.json(provider.values(repository)));
       @Html(provider.additionalScript)
     }
   }
   $('#@textareaId').textcomplete([
-    @gitbucket.core.plugin.PluginRegistry().getCompletionProposalProviders.map { provider =>
+    @gitbucket.core.plugin.PluginRegistry().getSuggestionProviders.map { provider =>
       @if(provider.context.contains(completionContext)){
         {
           id: '@{provider.id}',