Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Relaxed indentation context

Browse Source
This commit is contained in:
Kris De Volder
2017-04-04 18:02:32 -07:00
parent 77100d3893
commit d0fd620fec
7 changed files with 211 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseModel.java
View File

@@ -46,7 +46,6 @@ import com.google.common.collect.Multiset;
* and completion engine).
*/
public class ConcourseModel {
public static final YamlPath JOB_NAMES_PATH = new YamlPath(
anyChild(),
valueAt("jobs"),

82
vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java
View File

@@ -2618,7 +2618,7 @@ public class ConcourseEditorTest {
}
}
@Ignore @Test public void relaxedIndentContextMoreSpaces() throws Exception {
@Test public void relaxedIndentContextMoreSpaces() throws Exception {
Editor editor;
editor = harness.newEditor(
@@ -2635,20 +2635,72 @@ public class ConcourseEditorTest {
"source",
"type",
//For the nested context:
"branch",
"commit_verification_key_ids",
"commit_verification_keys",
"disable_ci_skip",
"git_config",
"gpg_keyserver",
"ignore_paths",
"password",
"paths",
"private_key",
"skip_ssl_verification",
"tag_filter",
"uri",
"username"
"➔ branch",
"➔ commit_verification_key_ids",
"➔ commit_verification_keys",
"➔ disable_ci_skip",
"➔ git_config",
"➔ gpg_keyserver",
"➔ ignore_paths",
"➔ password",
"➔ paths",
"➔ private_key",
"➔ skip_ssl_verification",
"➔ tag_filter",
"➔ uri",
"➔ username"
);
editor.assertCompletionWithLabel("check_every",
"resources:\n" +
"- name: foo\n" +
" type: git\n" +
" source:\n" +
" check_every: <*>"
);
editor.assertCompletionWithLabel("➔ branch",
"resources:\n" +
"- name: foo\n" +
" type: git\n" +
" source:\n" +
" branch: <*>"
);
editor.assertCompletionWithLabel("➔ commit_verification_key_ids",
"resources:\n" +
"- name: foo\n" +
" type: git\n" +
" source:\n" +
" commit_verification_key_ids:\n" +
" - <*>"
);
}
@Test public void relaxedIndentContextMoreSpaces2() throws Exception {
assertContextualCompletions(
"resources:\n" +
"- name: foo\n" +
" type: git\n" +
" source:\n" +
" <*>"
, // =========
"bra<*>"
, //=>
" branch: <*>"
);
assertContextualCompletions(
"resources:\n" +
"- name: foo\n" +
" type: git\n" +
" source:\n" +
" <*>"
, // =========
"comverids<*>"
, //=>
" commit_verification_key_ids:\n" +
" - <*>"
);
}