Merge branch 'master' into master

wz1000 · web-flow · commit c7784c7aecb7 · 2021-02-20T17:39:50.000+05:30
diff --git a/hls-plugin-api/src/Ide/Plugin/Config.hs b/hls-plugin-api/src/Ide/Plugin/Config.hs
@@ -117,6 +117,7 @@ instance A.ToJSON Config where
                  , "completionSnippetsOn"        .= completionSnippetsOn
                  , "formatOnImportOn"            .= formatOnImportOn
                  , "formattingProvider"          .= formattingProvider
+                 , "maxCompletions"              .= maxCompletions
                  , "plugin"                      .= plugins
                  ]
 

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ instance A.ToJSON Config where`
`117`	`117`	`, "completionSnippetsOn" .= completionSnippetsOn`
`118`	`118`	`, "formatOnImportOn" .= formatOnImportOn`
`119`	`119`	`, "formattingProvider" .= formattingProvider`
	`120`	`+ , "maxCompletions" .= maxCompletions`
`120`	`121`	`, "plugin" .= plugins`
`121`	`122`	`]`
`122`	`123`