Merge pull request #13 from MetRonnie/suite-to-flow

Change suite.rc -> flow.cylc
cylc · Aug 20, 2020 · e40ae6d · e40ae6d
2 parents 504abaf + be0f8bf
commit e40ae6d
Show file tree

Hide file tree

Showing 19 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![test](https://github.com/cylc/cylc-textmate-grammar/workflows/test/badge.svg?branch=master&event=push)
 
-This repository provides a TextMate grammar for Cylc workflow configuration (`suite.rc`) files, enabling syntax highlighting and other features.
+This repository provides a TextMate grammar for Cylc workflow configuration (`suite.rc` and `.cylc`) files, enabling syntax highlighting and other features.
 
 `cylc.tmLanguage.json` is the grammar file used by plugins for editors:
 - VSCode - [cylc/vscode-cylc](https://github.com/cylc/vscode-cylc)
@@ -147,7 +147,7 @@ npx eslint src/ lib/
 ```
 
 #### Unit tests
-We're using [vscode-tmgrammar-test](https://github.com/PanAeon/vscode-tmgrammar-test) for testing the textmate grammar. Test files reside in the `/tests` directory. These are essentially suite.rc files that are annotated with comments (filenames must match pattern `suite*.rc` or `suite*.rc.*`). The comments detail what the expected scopes of the test line are. The comments are read in by vscode-tmgrammar-test and compared to the actual applied scopes. An example test might be:
+We're using [vscode-tmgrammar-test](https://github.com/PanAeon/vscode-tmgrammar-test) for testing the textmate grammar. Test files reside in the `/tests` directory. These are essentially Cylc workflow files that are annotated with comments. The comments detail what the expected scopes of the test line are. The comments are read in by vscode-tmgrammar-test and compared to the actual applied scopes. An example test might be:
 ```ini
     foo = bar
 #   ^^^       variable.other.key.cylc

diff --git a/cylc.tmLanguage.json b/cylc.tmLanguage.json
@@ -5,6 +5,7 @@
         "suite.rc",
         "suite.rc.processed",
         "cylc",
+        "cylc.processed",
         "flow.rc",
         "flow-tests.rc"
     ],

diff --git a/reference-files/suite.rc → reference-files/flow.cylc b/reference-files/suite.rc → reference-files/flow.cylc
diff --git a/reference-files/suite_empy.rc → reference-files/flow_empy.cylc b/reference-files/suite_empy.rc → reference-files/flow_empy.cylc
diff --git a/reference-files/suite_jinja2.rc → reference-files/flow_jinja2.cylc b/reference-files/suite_jinja2.rc → reference-files/flow_jinja2.cylc
diff --git a/src/cylc.tmLanguage.js b/src/cylc.tmLanguage.js
@@ -787,7 +787,7 @@ class Jinja2Comment {
 exports.tmLanguage = {
     scopeName: 'source.cylc',
     $schema: 'https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json',
-    fileTypes: ['suite.rc', 'suite.rc.processed', 'cylc', 'flow.rc', 'flow-tests.rc'],
+    fileTypes: ['suite.rc', 'suite.rc.processed', 'cylc', 'cylc.processed', 'flow.rc', 'flow-tests.rc'],
     name: 'cylc',
     patterns: [
         {include: '#comments'},

diff --git a/tests/suite_1.1_sections_settings.rc → tests/1.1_sections_settings.cylc b/tests/suite_1.1_sections_settings.rc → tests/1.1_sections_settings.cylc
diff --git a/tests/suite_1.2_comments.rc → tests/1.2_comments.cylc b/tests/suite_1.2_comments.rc → tests/1.2_comments.cylc
diff --git a/tests/suite_1.3_multiline_strings.rc → tests/1.3_multiline_strings.cylc b/tests/suite_1.3_multiline_strings.rc → tests/1.3_multiline_strings.cylc
diff --git a/tests/suite_1.4_includes.rc → tests/1.4_includes.cylc b/tests/suite_1.4_includes.rc → tests/1.4_includes.cylc
diff --git a/tests/suite_2.10_inter_cycle_deps.rc → tests/2.10_inter_cycle_deps.cylc b/tests/suite_2.10_inter_cycle_deps.rc → tests/2.10_inter_cycle_deps.cylc
diff --git a/tests/suite_2.1_graph_tasks_deps.rc → tests/2.1_graph_tasks_deps.cylc b/tests/suite_2.1_graph_tasks_deps.rc → tests/2.1_graph_tasks_deps.cylc
diff --git a/tests/suite_2.2_graph_comments.rc → tests/2.2_graph_comments.cylc b/tests/suite_2.2_graph_comments.rc → tests/2.2_graph_comments.cylc
diff --git a/tests/suite_2.3_graph_operators.rc → tests/2.3_graph_operators.cylc b/tests/suite_2.3_graph_operators.rc → tests/2.3_graph_operators.cylc
diff --git a/tests/suite_2.4_graph_inter_suite.rc → tests/2.4_graph_inter_suite.cylc b/tests/suite_2.4_graph_inter_suite.rc → tests/2.4_graph_inter_suite.cylc
diff --git a/tests/suite_2.5_xtriggers.rc → tests/2.5_xtriggers.cylc b/tests/suite_2.5_xtriggers.rc → tests/2.5_xtriggers.cylc
diff --git a/tests/suite_2.6-8_params.rc → tests/2.6-8_params.cylc b/tests/suite_2.6-8_params.rc → tests/2.6-8_params.cylc
diff --git a/tests/suite_2.9_graph_qualifiers.rc → tests/2.9_graph_qualifiers.cylc b/tests/suite_2.9_graph_qualifiers.rc → tests/2.9_graph_qualifiers.cylc
diff --git a/tests/suite_3.2-3_jinja.rc → tests/3.2-3_jinja.cylc b/tests/suite_3.2-3_jinja.rc → tests/3.2-3_jinja.cylc