From b1ae19d9c653b2bc8ddca200c05371cd6f3f59a9 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Tue, 29 Aug 2017 09:25:41 -0700 Subject: [PATCH] Make `fetch` parameter in git-resource deprecated See discussion here: - https://github.com/concourse/git-resource/issues/118 - https://www.pivotaltracker.com/story/show/150640930 --- .../ide/vscode/concourse/PipelineYmlSchema.java | 2 +- .../ide/vscode/concourse/ConcourseEditorTest.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java index 71af2b38a..93c8882b9 100644 --- a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java +++ b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java @@ -426,7 +426,7 @@ public class PipelineYmlSchema implements YamlSchema { addProp(get, "depth", t_pos_integer); addProp(get, "submodules", f.yany("GitSubmodules").addHints("all", "none")); addProp(get, "disable_git_lfs", t_boolean); - addProp(get, "fetch", t_strings); //Warning: t_strings is just a guess. This property is undocumented. The example I've seen seem to use list of git branch/tag names. + addProp(get, "fetch", t_strings).isDeprecated(true); //Warning: t_strings is just a guess. This property is undocumented. The example I've seen seem to use list of git branch/tag names. AbstractType put = f.ybean("GitPutParams"); addProp(put, "repository", t_ne_string).isPrimary(true); diff --git a/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java index 173a7b37b..a29a31622 100644 --- a/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java +++ b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java @@ -1162,11 +1162,11 @@ public class ConcourseEditorTest { , "disable_git_lfs: <*>" , - "fetch:\n" + - " - <*>" - , "submodules:\n"+ " <*>" + , + "fetch:\n" + // Deprecated, so not suggested + " - <*>" ); assertContextualCompletions(context, "disable_git_lfs: <*>" @@ -3911,7 +3911,8 @@ public class ConcourseEditorTest { " fetch: [master]\n" + " submodules: none\n" ); - editor.assertProblems(/*NONE*/); + Diagnostic p = editor.assertProblems("fetch|Deprecated").get(0); + assertEquals(DiagnosticSeverity.Warning, p.getSeverity()); } @Test public void bug_150337510() throws Exception {