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

Fix for https://github.com/spring-projects/sts4/issues/194

Browse Source
This commit is contained in:
Kris De Volder
2019-01-31 12:49:44 -08:00
parent 44832b3787
commit 78f6380e21
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/github/GithubValueParsers.java
View File

@@ -89,10 +89,14 @@ public class GithubValueParsers {
for (String expectedPrefix : GithubRepoContentAssistant.URI_PREFIXES) {
int lastChar = expectedPrefix.length()-1;
if (str.startsWith(expectedPrefix.substring(0, lastChar))) {
if (str.charAt(lastChar)==expectedPrefix.charAt(lastChar)) {
char actualSeparator = str.charAt(lastChar);
char expectedSeparator = expectedPrefix.charAt(lastChar);
if (actualSeparator==expectedSeparator) {
return expectedPrefix;
}
throw new ValueParseException("Expecting a '"+expectedPrefix.charAt(lastChar)+"'", lastChar, lastChar+1);
if (actualSeparator==':' || actualSeparator == '/') {
throw new ValueParseException("Expecting a '"+expectedSeparator+"'", lastChar, lastChar+1);
}
}
}
return null;

25
headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java
View File

@@ -4752,6 +4752,31 @@ public class ConcourseEditorTest {
);
}
@Test public void githubUriReconciling_bug_194() throws Exception {
//See: https://github.com/spring-projects/sts4/issues/194
Editor editor;
editor = harness.newEditor(
"resources:\n" +
"- name: my-repo\n" +
" type: git\n" +
" source:\n" +
" uri: git@github.computer.com:me/repo.git\n"
);
editor.assertProblems("my-repo|Unused");
editor = harness.newEditor(
"resources:\n" +
"- name: my-repo\n" +
" type: git\n" +
" source:\n" +
" uri: https://github.computer.com/me/repo.git\n"
);
editor.assertProblems("my-repo|Unused");
}
@Test public void githubUriReconciling() throws Exception {
when(github.getReposForOwner("the-owner")).thenReturn(ImmutableList.of(
"nice-repo", "cool-project", "good-stuff"