From dcd0f608fcfb73f6eabb9d41b5f55924c56ad133 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Wed, 9 Aug 2017 17:31:07 -0400 Subject: [PATCH 1/2] Use latest publish atom-languageclient. Remove the moved atom-cf-manifest-yaml source --- atom-extensions/atom-commons/package.json | 2 +- atom-extensions/atom-manifest-yaml/.gitignore | 2 - atom-extensions/atom-manifest-yaml/README.MD | 10 --- .../atom-manifest-yaml/coffeelint.json | 37 ---------- .../grammars/cf-manifest-yaml.cson | 8 --- .../atom-manifest-yaml/lib/main.js | 57 --------------- .../atom-manifest-yaml/package.json | 72 ------------------- .../settings/language-cf-manifest-yaml.cson | 8 --- 8 files changed, 1 insertion(+), 195 deletions(-) delete mode 100644 atom-extensions/atom-manifest-yaml/.gitignore delete mode 100644 atom-extensions/atom-manifest-yaml/README.MD delete mode 100644 atom-extensions/atom-manifest-yaml/coffeelint.json delete mode 100644 atom-extensions/atom-manifest-yaml/grammars/cf-manifest-yaml.cson delete mode 100644 atom-extensions/atom-manifest-yaml/lib/main.js delete mode 100644 atom-extensions/atom-manifest-yaml/package.json delete mode 100644 atom-extensions/atom-manifest-yaml/settings/language-cf-manifest-yaml.cson diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json index 0ab121524..506521020 100644 --- a/atom-extensions/atom-commons/package.json +++ b/atom-extensions/atom-commons/package.json @@ -8,7 +8,7 @@ "atom": ">=1.17.0" }, "dependencies": { - "atom-languageclient": "git://github.com/atom/atom-languageclient#fdb8540d2e3862fe5f855b126a52afdb0b778e3a", + "atom-languageclient": "0.2.0", "decompress": "^4.2.0", "portfinder": "^1.0.13", "remote-file-size": "^3.0.3", diff --git a/atom-extensions/atom-manifest-yaml/.gitignore b/atom-extensions/atom-manifest-yaml/.gitignore deleted file mode 100644 index eb7ba7f6c..000000000 --- a/atom-extensions/atom-manifest-yaml/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/node_modules -/server diff --git a/atom-extensions/atom-manifest-yaml/README.MD b/atom-extensions/atom-manifest-yaml/README.MD deleted file mode 100644 index dc75d0ee3..000000000 --- a/atom-extensions/atom-manifest-yaml/README.MD +++ /dev/null @@ -1,10 +0,0 @@ -# CF Manifest YAML for Atom - -## Dev environment setup: -**Prerequisite**: Node 6.x.x or higher is installed, Atom 1.17 or higher is installed -1. Clone STS4 git repository -2. Navigate to `sts4/atom-extensions/atom-manifest-yaml` folder -3. Run `npm install` -4. Execute `apm link .` from the folder above -5. Perform `Reload Window` in Atom (Cmd-Shift-P opens commands palette, search for `reaload`, select, press `Return`) -6. Open any `manifest.yml` file in Atom observe reconciling, content assist and other IDE features diff --git a/atom-extensions/atom-manifest-yaml/coffeelint.json b/atom-extensions/atom-manifest-yaml/coffeelint.json deleted file mode 100644 index d6c3236aa..000000000 --- a/atom-extensions/atom-manifest-yaml/coffeelint.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "max_line_length": { - "level": "ignore" - }, - "no_empty_param_list": { - "level": "error" - }, - "arrow_spacing": { - "level": "error" - }, - "no_interpolation_in_single_quotes": { - "level": "error" - }, - "no_debugger": { - "level": "error" - }, - "prefer_english_operator": { - "level": "error" - }, - "colon_assignment_spacing": { - "spacing": { - "left": 0, - "right": 1 - }, - "level": "error" - }, - "braces_spacing": { - "spaces": 0, - "level": "error" - }, - "spacing_after_comma": { - "level": "error" - }, - "no_stand_alone_at": { - "level": "error" - } -} \ No newline at end of file diff --git a/atom-extensions/atom-manifest-yaml/grammars/cf-manifest-yaml.cson b/atom-extensions/atom-manifest-yaml/grammars/cf-manifest-yaml.cson deleted file mode 100644 index ca7d226ee..000000000 --- a/atom-extensions/atom-manifest-yaml/grammars/cf-manifest-yaml.cson +++ /dev/null @@ -1,8 +0,0 @@ -'scopeName': 'source.cf-manifest-yaml' -'name': 'Manifest-YAML' -'fileTypes': [ - 'manifest.yml' -] -'patterns': [ - { 'include': 'source.yaml' } -] diff --git a/atom-extensions/atom-manifest-yaml/lib/main.js b/atom-extensions/atom-manifest-yaml/lib/main.js deleted file mode 100644 index fa269aa78..000000000 --- a/atom-extensions/atom-manifest-yaml/lib/main.js +++ /dev/null @@ -1,57 +0,0 @@ -const path = require('path'); -const { JarLanguageClient } = require('pivotal-atom-languageclient-commons'); - -class ManifestYamlLanguageClient extends JarLanguageClient { - - constructor() { - super( - 'https://s3-us-west-1.amazonaws.com/s3-test.spring.io/sts4/fatjars/snapshots/manifest-yaml-language-server-0.0.9-201707270057.jar', - path.join(__dirname, '..', 'server') - ); - - this.statusElement = document.createElement('span'); - this.statusElement.className = 'inline-block'; - } - - getGrammarScopes() { - return ['source.cf-manifest-yaml'] - } - - getLanguageName() { - return 'Manifest-YAML' - } - - getServerName() { - return 'CF Manifest YAML' - } - - handleDownlaodPercentChange(bytesDone, size, percent) { - this.updateStatusBar(`downloading ${percent}%`); - } - - handleServerInstalled() { - this.updateStatusBar('installed'); - } - - consumeStatusBar (statusBar) { - this.statusTile = statusBar.addRightTile({ item: this.statusElement, priority: 1000 }); - } - - updateStatusBar (text) { - this.statusElement.textContent = `${this.name} ${text}`; - } - - launchVmArgs(version) { - return [ - '-Dlsp.yaml.completions.errors.disable=true', - '-Xdebug', - '-agentlib:jdwp=transport=dt_socket,address=9000,server=y,suspend=n', - '-Dorg.slf4j.simpleLogger.logFile=manifest-yaml.log', - '-Dorg.slf4j.simpleLogger.defaultLogLevel=debug', - ]; - - } - -} - -module.exports = new ManifestYamlLanguageClient(); diff --git a/atom-extensions/atom-manifest-yaml/package.json b/atom-extensions/atom-manifest-yaml/package.json deleted file mode 100644 index bc932a994..000000000 --- a/atom-extensions/atom-manifest-yaml/package.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "name": "pivotal-atom-cf-manifest-yaml", - "main": "./lib/main", - "version": "0.0.1", - "description": "Cloud Foundry Deployment Manifest YAML support for Atom", - "repository": "https://github.com/spring-projects/sts4/atom-extensions/atom-manifest-yaml", - "license": "MIT", - "engines": { - "atom": ">=1.17.0" - }, - "files": [ - "grammars/", - "settings/", - "lib/" - ], - "dependencies": { - "decompress": "^4.2.0", - "portfinder": "^1.0.13", - "remote-file-size": "^3.0.3", - "pivotal-atom-languageclient-commons": "0.0.1" - }, - "devDependencies": { - "coffeelint": "^1.10.1" - }, - "scripts": { - "clean": "rm -fr node_modules" - }, - "consumedServices": { - "linter-indie": { - "versions": { - "2.0.0": "consumeLinterV2" - } - }, - "nuclide-datatip.provider": { - "versions": { - "0.0.0": "consumeDatatip" - } - }, - "status-bar": { - "versions": { - "^1.0.0": "consumeStatusBar" - } - } - }, - "providedServices": { - "autocomplete.provider": { - "versions": { - "2.0.0": "provideAutocomplete" - } - }, - "nuclide-code-format.provider": { - "versions": { - "0.0.0": "provideCodeFormat" - } - }, - "nuclide-definition-provider": { - "versions": { - "0.0.0": "provideDefinitions" - } - }, - "nuclide-find-references.provider": { - "versions": { - "0.0.0": "provideFindReferences" - } - }, - "nuclide-outline-view": { - "versions": { - "0.0.0": "provideOutlines" - } - } - } -} diff --git a/atom-extensions/atom-manifest-yaml/settings/language-cf-manifest-yaml.cson b/atom-extensions/atom-manifest-yaml/settings/language-cf-manifest-yaml.cson deleted file mode 100644 index 64852edfa..000000000 --- a/atom-extensions/atom-manifest-yaml/settings/language-cf-manifest-yaml.cson +++ /dev/null @@ -1,8 +0,0 @@ -'.source.yaml': - 'editor': - 'autoIndentOnPaste': false - 'commentStart': '# ' - 'foldEndPattern': '^\\s*$|^\\s*\\}|^\\s*\\]|^\\s*\\)' - 'increaseIndentPattern': '^\\s*.*(:|-) ?(&\\w+)?(\\{[^}"\']*|\\([^)"\']*)?$' - 'decreaseIndentPattern': '^\\s+\\}$' -'tabType': 'soft' \ No newline at end of file From 6b7593b1d9e9afc8ee78d3e676ba8fa77d0f28d4 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Wed, 9 Aug 2017 17:32:27 -0400 Subject: [PATCH 2/2] 0.0.4 --- atom-extensions/atom-commons/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json index 506521020..8f80b1f91 100644 --- a/atom-extensions/atom-commons/package.json +++ b/atom-extensions/atom-commons/package.json @@ -1,6 +1,6 @@ { "name": "pivotal-atom-languageclient-commons", - "version": "0.0.3", + "version": "0.0.4", "description": "Atom language client commons for STS4 language servers", "repository": "https://github.com/spring-projects/sts4", "license": "MIT",