Skip to content

Commit

Permalink
Added support for scalariformFormat (dragos#44)
Browse files Browse the repository at this point in the history 
* Added support to scalariformFormat in package.json

* Added support for scalariformFormat in sbt task handler
  • Loading branch information
@dragos
Ganesh Prasad Kumble authored and dragos committed Jun 9, 2017
1 parent f3f418a commit f42baea
Show file tree
Hide file tree
Showing 2 changed files with 136 additions and 109 deletions.
238 changes: 130 additions & 108 deletions scala/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,110 +1,132 @@
{
"name": "scala-lsp",
"displayName": "Scala Language Server",
"description": "A Scala language server based on Ensime",
"icon": "images/scala-logo.png",
"version": "0.1.4",
"repository": {
"url": "https://github.com/dragos/dragos-vscode-scala"
},
"bugs": {
"url": "https://github.com/dragos/dragos-vscode-scala/issues"
},
"publisher": "dragos",
"engines": {
"vscode": "^1.10.0"
},
"categories": [
"Languages"
],
"activationEvents": [
"onLanguage:scala",
"onCommand:sbt.update",
"onCommand:sbt.compile",
"onCommand:sbt.run",
"onCommand:sbt.test",
"onCommand:sbt.clean",
"onCommand:sbt.reload",
"onCommand:sbt.package",
"onCommand:sbt.ensimeConfig"
],
"main": "./out/src/extension",
"contributes": {
"languages": [{
"id": "scala",
"aliases": ["Scala", "scala"],
"extensions": [".scala"],
"configuration": "./scala.configuration.json"
}],
"grammars": [{
"language": "scala",
"scopeName": "source.scala",
"path": "./syntaxes/scala.tmLanguage"
}],
"snippets": [{
"language": "scala",
"path": "./snippets/scala.json"
}],
"commands": [
{
"command": "sbt.update",
"title": "update",
"category": "sbt"
},
{
"command": "sbt.compile",
"title": "compile",
"category": "sbt"
},
{
"command": "sbt.run",
"title": "run",
"category": "sbt"
},
{
"command": "sbt.test",
"title": "test",
"category": "sbt"
},
{
"command": "sbt.clean",
"title": "clean",
"category": "sbt"
},
{
"command": "sbt.reload",
"title": "reload",
"category": "sbt"
},
{
"command": "sbt.package",
"title": "package",
"category": "sbt"
},
{
"command": "sbt.ensimeConfig",
"title": "ensimeConfig",
"category": "sbt"
}
]
},
"scripts": {
"vscode:prepublish": "curl -L -o coursier https://github.com/alexarchambault/coursier/raw/991b60ddbcb7d781c17a463f7af980f2dd888d4b/coursier && tsc -p ./",
"compile": "tsc -watch -p ./",
"postinstall": "node ./node_modules/vscode/bin/install"
},
"devDependencies": {
"typescript": "^2.2.1",
"vscode": "^1.0.5",
"mocha": "^3.2.0",
"@types/node": "^7.0.7",
"@types/mocha": "^2.2.39",
"tslint": "^4.5.1"
},
"dependencies": {
"vscode-languageclient": "^3.1.0",
"find-java-home": "0.1.4",
"path-exists": "^3.0.0",
"expand-home-dir": "^0.0.3"
}
"name": "scala-lsp",
"displayName": "Scala Language Server",
"description": "A Scala language server based on Ensime",
"icon": "images/scala-logo.png",
"version": "0.1.4",
"repository": {
"url": "https://github.com/dragos/dragos-vscode-scala"
},
"bugs": {
"url": "https://github.com/dragos/dragos-vscode-scala/issues"
},
"publisher": "dragos",
"engines": {
"vscode": "^1.10.0"
},
"categories": [
"Languages"
],
"activationEvents": [
"onLanguage:scala",
"onCommand:sbt.update",
"onCommand:sbt.compile",
"onCommand:sbt.run",
"onCommand:sbt.test",
"onCommand:sbt.clean",
"onCommand:sbt.reload",
"onCommand:sbt.package",
"onCommand:sbt.ensimeConfig",
"onCommand:sbt.scalariformFormat"
],
"main": "./out/src/extension",
"contributes": {
"languages": [
{
"id": "scala",
"aliases": [
"Scala",
"scala"
],
"extensions": [
".scala"
],
"configuration": "./scala.configuration.json"
}
],
"grammars": [
{
"language": "scala",
"scopeName": "source.scala",
"path": "./syntaxes/scala.tmLanguage"
}
],
"snippets": [
{
"language": "scala",
"path": "./snippets/scala.json"
}
],
"commands": [
{
"command": "sbt.update",
"title": "update",
"category": "sbt"
},
{
"command": "sbt.compile",
"title": "compile",
"category": "sbt"
},
{
"command": "sbt.run",
"title": "run",
"category": "sbt"
},
{
"command": "sbt.test",
"title": "test",
"category": "sbt"
},
{
"command": "sbt.clean",
"title": "clean",
"category": "sbt"
},
{
"command": "sbt.reload",
"title": "reload",
"category": "sbt"
},
{
"command": "sbt.package",
"title": "package",
"category": "sbt"
},
{
"command": "sbt.ensimeConfig",
"title": "ensimeConfig",
"category": "sbt"
},
{
"command": "sbt.scalariformFormat",
"title": "scalariformFormat",
"category": "sbt"
}
]
},
"scripts": {
"vscode:prepublish": "curl -L -o coursier https://github.com/alexarchambault/coursier/raw/991b60ddbcb7d781c17a463f7af980f2dd888d4b/coursier && tsc -p ./",
"compile": "tsc -watch -p ./",
"postinstall": "node ./node_modules/vscode/bin/install"
},
"devDependencies": {
"typescript": "^2.2.1",
"vscode": "^1.0.5",
"mocha": "^3.2.0",
"@types/node": "^7.0.7",
"@types/mocha": "^2.2.39",
"tslint": "^4.5.1"
},
"dependencies": {
"vscode-languageclient": "^3.1.0",
"find-java-home": "0.1.4",
"path-exists": "^3.0.0",
"expand-home-dir": "^0.0.3"
},
"__metadata": {
"id": "aef85b85-41b9-433a-919e-19a72452133a",
"publisherId": "d4754681-7e07-40a3-b423-75167164e5c3",
"publisherDisplayName": "Iulian Dragos"
}
}
7 changes: 6 additions & 1 deletion scala/src/sbt.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ export class Sbt {
const runSbtEnsimeConfig = () => {
runSbtCommand(['ensimeConfig']);
};

const runSbtscalariformFormat = () => {
runSbtCommand(['scalariformFormat']);
};

const registerCommands = (ctx: ExtensionContext) => {
ctx.subscriptions.push(
Expand All @@ -67,7 +71,8 @@ export class Sbt {
commands.registerCommand('sbt.clean', runSbtClean),
commands.registerCommand('sbt.reload', runSbtReload),
commands.registerCommand('sbt.package', runSbtPackage),
commands.registerCommand('sbt.ensimeConfig', runSbtEnsimeConfig)
commands.registerCommand('sbt.ensimeConfig', runSbtEnsimeConfig),
commands.registerCommand('sbt.scalariformFormat', runSbtscalariformFormat)
);
};

Expand Down

0 comments on commit f42baea

Please sign in to comment.