Remove snippet package, fixes #18

- commit yarn lock file to ensure everybody use the same dependency versions. This is considered a best practice. - move `syntax/` directory to the toplevel since the snippet package is now gone. - gitignore vsix files so that running `vsce package` (build local extension) doesn't produce diffs.
scala · May 2, 2019 · f554622 · f554622
1 parent 8a4ae57
commit f554622
Show file tree

Hide file tree

Showing 23 changed files with 139 additions and 326 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 # Autogenerated synax files
-syntax/syntaxes/Scala.tmLanguage.json
+syntaxes/Scala.tmLanguage.json
 
-syntax/node_modules
+node_modules
+
+*.vsix
diff --git a/syntax/.vscodeignore → .vscodeignore b/syntax/.vscodeignore → .vscodeignore
diff --git a/README.md b/README.md
@@ -1,8 +1,34 @@
-# Scala Syntax and Snippets
-Visual Studio Code extensions that provide Scala syntax and snippets.
+# Scala Syntax
 
-Refer to the READMEs in the respective directories:
+[VS Code plugin](https://marketplace.visualstudio.com/items?itemName=scala-lang.scala)
 
-- [Scala Syntax](/syntax)
-- [Scala Snippets](/snippets)
+## Features
 
+Extension providing Scala syntax.
+
+## Requirements
+
+No requirements.
+
+## Development
+
+The source language file is located at `src/typescript/Scala.tmlanguage.ts`. The output tmLanguage file `syntaxes/Scala.tmLanguage.json` is marked as ignored in git and shouldn't be commited.
+
+To generate the ouput file either use build command or run:
+
+```bash
+npm install
+```
+
+The output file is validated against the json schema before being written.
+
+
+## Based on
+* Plugin: https://github.com/daltonjorge/vscode-scala
+* Template: https://github.com/sellmerfud/scala.tmbundle (https://github.com/mads-hartmann/scala.tmbundle)
+* Textmate json schema: https://github.com/Septh/tmlanguage/blob/master/tmLanguage.schema.json
+
+## License
+[MIT](LICENSE)
+
+-----------------------------------------------------------------------------------------------------------
diff --git a/snippets/images/smooth-spiral.png → images/smooth-spiral.png b/snippets/images/smooth-spiral.png → images/smooth-spiral.png
diff --git a/syntax/language-configuration.json → language-configuration.json b/syntax/language-configuration.json → language-configuration.json
diff --git a/syntax/package.json → package.json b/syntax/package.json → package.json
diff --git a/snippets/.vscode/launch.json b/snippets/.vscode/launch.json
diff --git a/snippets/README.md b/snippets/README.md
diff --git a/snippets/package.json b/snippets/package.json
diff --git a/snippets/snippets.json b/snippets/snippets.json
diff --git a/snippets/vsc-extension-quickstart.md b/snippets/vsc-extension-quickstart.md
diff --git a/syntax/src/schemas/tmlanguage.json → src/schemas/tmlanguage.json b/syntax/src/schemas/tmlanguage.json → src/schemas/tmlanguage.json
diff --git a/.../src/typescript/GenerateTmLanguageFile.ts → src/typescript/GenerateTmLanguageFile.ts b/.../src/typescript/GenerateTmLanguageFile.ts → src/typescript/GenerateTmLanguageFile.ts
diff --git a/syntax/src/typescript/Scala.tmLanguage.ts → src/typescript/Scala.tmLanguage.ts b/syntax/src/typescript/Scala.tmLanguage.ts → src/typescript/Scala.tmLanguage.ts
diff --git a/syntax/src/typescript/TMLanguageModel.ts → src/typescript/TMLanguageModel.ts b/syntax/src/typescript/TMLanguageModel.ts → src/typescript/TMLanguageModel.ts
diff --git a/syntax/.vscode/launch.json b/syntax/.vscode/launch.json
diff --git a/syntax/.vscode/tasks.json b/syntax/.vscode/tasks.json
diff --git a/syntax/README.md b/syntax/README.md
diff --git a/syntax/images/smooth-spiral.png b/syntax/images/smooth-spiral.png
diff --git a/syntax/package-lock.json b/syntax/package-lock.json
diff --git a/syntax/syntaxes/.gitkeep → syntaxes/.gitkeep b/syntax/syntaxes/.gitkeep → syntaxes/.gitkeep
diff --git a/syntax/vsc-extension-quickstart.md → vsc-extension-quickstart.md b/syntax/vsc-extension-quickstart.md → vsc-extension-quickstart.md