From 8bfbff8c4475bf98c9f41246614211950f213629 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Fri, 10 May 2019 11:37:17 -0700 Subject: [PATCH] More debug output for failing CI tests --- concourse/pipeline.yml | 22 ++++++++----------- .../completion/TopLevelAssistContext.java | 10 +++++++++ .../yaml/completion/YTypeAssistContext.java | 6 +++++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 2c7952077..0dd786bc3 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -289,22 +289,18 @@ resources: build_name: spring-tools-4 ######################################################################################## jobs: -- name: run-concourse-ls-tests - serial: true +- name: concourse-ls-tests + max_in_flight: 4 plan: - get: every-minute trigger: true - - get: sts4 + - aggregate: + - get: maven-cache + - get: sts4 - task: run-concourse-ls-test - config: - platform: linux - image_resource: - type: docker-image - source: - repository: kdvolder/sts4-build-env - run: - dir: sts4/headless-services/concourse-language-server - path: build.sh + file: sts4/concourse/tasks/build-vsix.yml + params: + extension_id: vscode-concourse on_failure: put: slack-notification params: @@ -1572,7 +1568,7 @@ groups: # - publish-headless-snapshots - name: debugging jobs: - - run-concourse-ls-tests + - concourse-ls-tests - name: npm-packages jobs: - publish-jvm-launch-utils diff --git a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java index 39495ee65..bfb76509d 100644 --- a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java +++ b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java @@ -13,6 +13,8 @@ package org.springframework.ide.vscode.commons.yaml.completion; import java.util.Collection; import java.util.Collections; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; import org.springframework.ide.vscode.commons.util.Renderable; import org.springframework.ide.vscode.commons.util.text.DocumentRegion; @@ -34,9 +36,17 @@ import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser * @author Kris De Volder */ public abstract class TopLevelAssistContext implements YamlAssistContext { + + final static Logger logger = LoggerFactory.getLogger(TopLevelAssistContext.class); @Override public YamlAssistContext traverse(YamlPathSegment s) throws Exception { + YamlAssistContext result = _traverse(s); + logger.debug("Traversing {} with {} => {}", this, s, result); + return result; + } + + protected YamlAssistContext _traverse(YamlPathSegment s) { Integer documentSelector = s.toIndex(); if (documentSelector!=null) { return getDocumentContext(documentSelector); diff --git a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java index 605ad2f76..54f62d90e 100644 --- a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java +++ b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java @@ -307,6 +307,12 @@ public class YTypeAssistContext extends AbstractYamlAssistContext { @Override public YamlAssistContext traverse(YamlPathSegment s) throws Exception { + YamlAssistContext result = _traverse(s); + logger.debug("Traversing {} with {} => {}", this, s, result); + return result; + } + + protected YamlAssistContext _traverse(YamlPathSegment s) { if (s.getType()==YamlPathSegmentType.VAL_AT_KEY) { if (typeUtil.isSequencable(type) || typeUtil.isMap(type)) { return contextWith(s, typeUtil.getDomainType(type));