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

commons-yaml package renames

Browse Source 
Bring package names inline with project-name
This commit is contained in:
Kris De Volder
2016-10-20 10:03:25 -07:00
parent 61fb272209
commit ac92d37d75
50 changed files with 188 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/Type.java
View File

@@ -20,7 +20,7 @@ import org.springframework.ide.vscode.commons.util.ArrayUtils;
import org.springframework.ide.vscode.commons.util.Assert;
import org.springframework.ide.vscode.commons.util.Log;
import org.springframework.ide.vscode.commons.util.StringUtil;
import org.springframework.ide.vscode.yaml.schema.YType;
import org.springframework.ide.vscode.commons.yaml.schema.YType;
/**
* @author Kris De Volder

4
vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/types/TypedProperty.java
View File

@@ -4,8 +4,8 @@ import javax.inject.Provider;
import org.springframework.boot.configurationmetadata.Deprecation;
import org.springframework.ide.vscode.commons.util.HtmlSnippet;
import org.springframework.ide.vscode.yaml.schema.YTypedProperty;
import org.springframework.ide.vscode.yaml.util.DescriptionProviders;
import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty;
import org.springframework.ide.vscode.commons.yaml.util.DescriptionProviders;
/**
* Represents a property on a Type that can be accessed by name.

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/NodeRef.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeRef.java
View File

@@ -1,4 +1,4 @@
package org.springframework.ide.vscode.yaml.ast;
package org.springframework.ide.vscode.commons.yaml.ast;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/NodeUtil.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeUtil.java
View File

@@ -1,4 +1,4 @@
package org.springframework.ide.vscode.yaml.ast;
package org.springframework.ide.vscode.commons.yaml.ast;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.NodeId;

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlASTProvider.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlASTProvider.java
View File

@@ -1,4 +1,4 @@
package org.springframework.ide.vscode.yaml.ast;
package org.springframework.ide.vscode.commons.yaml.ast;
import org.springframework.ide.vscode.commons.languageserver.util.IDocument;

12
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlFileAST.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlFileAST.java
View File

@@ -1,6 +1,6 @@
package org.springframework.ide.vscode.yaml.ast;
package org.springframework.ide.vscode.commons.yaml.ast;
import static org.springframework.ide.vscode.yaml.ast.NodeUtil.contains;
import static org.springframework.ide.vscode.commons.yaml.ast.NodeUtil.contains;
import java.util.ArrayList;
import java.util.Collections;
@@ -9,10 +9,10 @@ import java.util.List;
import org.springframework.ide.vscode.commons.util.Collector;
import org.springframework.ide.vscode.commons.util.IRequestor;
import org.springframework.ide.vscode.commons.util.RememberLast;
import org.springframework.ide.vscode.yaml.ast.NodeRef.RootRef;
import org.springframework.ide.vscode.yaml.ast.NodeRef.SeqRef;
import org.springframework.ide.vscode.yaml.ast.NodeRef.TupleKeyRef;
import org.springframework.ide.vscode.yaml.ast.NodeRef.TupleValueRef;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.RootRef;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.SeqRef;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.TupleKeyRef;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.TupleValueRef;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.SequenceNode;

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/ast/YamlParser.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlParser.java
View File

@@ -1,4 +1,4 @@
package org.springframework.ide.vscode.yaml.ast;
package org.springframework.ide.vscode.commons.yaml.ast;
import java.io.StringReader;

16
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/AbstractYamlAssistContext.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/AbstractYamlAssistContext.java
View File

@@ -8,16 +8,16 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.completion;
package org.springframework.ide.vscode.commons.yaml.completion;
import org.springframework.ide.vscode.commons.languageserver.util.PrefixFinder;
import org.springframework.ide.vscode.yaml.path.YamlPath;
import org.springframework.ide.vscode.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SDocNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNodeType;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SRootNode;
import org.springframework.ide.vscode.commons.yaml.path.YamlPath;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SDocNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNodeType;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SRootNode;
/**
* @author Kris De Volder

8
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/CompletionFactory.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/CompletionFactory.java
View File

@@ -1,11 +1,11 @@
package org.springframework.ide.vscode.yaml.completion;
package org.springframework.ide.vscode.commons.yaml.completion;
import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits;
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal;
import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
import org.springframework.ide.vscode.yaml.schema.YType;
import org.springframework.ide.vscode.yaml.schema.YTypeUtil;
import org.springframework.ide.vscode.yaml.schema.YTypedProperty;
import org.springframework.ide.vscode.commons.yaml.schema.YType;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil;
import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty;
public interface CompletionFactory {

8
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/DefaultCompletionFactory.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/DefaultCompletionFactory.java
View File

@@ -1,13 +1,13 @@
package org.springframework.ide.vscode.yaml.completion;
package org.springframework.ide.vscode.commons.yaml.completion;
import java.util.Comparator;
import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits;
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal;
import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
import org.springframework.ide.vscode.yaml.schema.YType;
import org.springframework.ide.vscode.yaml.schema.YTypeUtil;
import org.springframework.ide.vscode.yaml.schema.YTypedProperty;
import org.springframework.ide.vscode.commons.yaml.schema.YType;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil;
import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty;
import io.typefox.lsapi.CompletionItemKind;

6
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/SchemaBasedYamlAssistContextProvider.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/SchemaBasedYamlAssistContextProvider.java
View File

@@ -8,10 +8,10 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.completion;
package org.springframework.ide.vscode.commons.yaml.completion;
import org.springframework.ide.vscode.yaml.schema.YamlSchema;
import org.springframework.ide.vscode.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
/**
* A {@link YamlAssistContextProvider} that creates {@link YamlAssistContext}s from {@link YamlSchema}

8
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/TopLevelAssistContext.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java
View File

@@ -8,15 +8,15 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.completion;
package org.springframework.ide.vscode.commons.yaml.completion;
import java.util.Collection;
import java.util.Collections;
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal;
import org.springframework.ide.vscode.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode;
/**
* Abstract YamlAssistContext for the toplevel of a YamlDocument.

26
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YTypeAssistContext.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.completion;
package org.springframework.ide.vscode.commons.yaml.completion;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,18 +24,18 @@ import org.springframework.ide.vscode.commons.languageserver.completion.Document
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal;
import org.springframework.ide.vscode.commons.util.CollectionUtil;
import org.springframework.ide.vscode.commons.util.FuzzyMatcher;
import org.springframework.ide.vscode.yaml.path.YamlPath;
import org.springframework.ide.vscode.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.yaml.path.YamlPathSegment.YamlPathSegmentType;
import org.springframework.ide.vscode.yaml.schema.YType;
import org.springframework.ide.vscode.yaml.schema.YTypeUtil;
import org.springframework.ide.vscode.yaml.schema.YTypedProperty;
import org.springframework.ide.vscode.yaml.schema.YValueHint;
import org.springframework.ide.vscode.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SChildBearingNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.yaml.util.YamlIndentUtil;
import org.springframework.ide.vscode.commons.yaml.path.YamlPath;
import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment.YamlPathSegmentType;
import org.springframework.ide.vscode.commons.yaml.schema.YType;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil;
import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty;
import org.springframework.ide.vscode.commons.yaml.schema.YValueHint;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SChildBearingNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.commons.yaml.util.YamlIndentUtil;
public class YTypeAssistContext extends AbstractYamlAssistContext {

8
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlAssistContext.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContext.java
View File

@@ -8,14 +8,14 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.completion;
package org.springframework.ide.vscode.commons.yaml.completion;
import java.util.Collection;
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal;
import org.springframework.ide.vscode.yaml.path.YamlNavigable;
import org.springframework.ide.vscode.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.commons.yaml.path.YamlNavigable;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode;
/**
* @author Kris De Volder

4
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlAssistContextProvider.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContextProvider.java
View File

@@ -8,9 +8,9 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.completion;
package org.springframework.ide.vscode.commons.yaml.completion;
import org.springframework.ide.vscode.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
/**
* Defines a way to obtain a 'toplevel' {@link YamlAssistContext} for a given {@link YamlDocument}

20
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlCompletionEngine.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlCompletionEngine.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.completion;
package org.springframework.ide.vscode.commons.yaml.completion;
import java.util.Collection;
import java.util.Collections;
@@ -19,15 +19,15 @@ import org.springframework.ide.vscode.commons.languageserver.completion.IComplet
import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal;
import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
import org.springframework.ide.vscode.commons.util.Assert;
import org.springframework.ide.vscode.yaml.path.YamlPath;
import org.springframework.ide.vscode.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNodeType;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SRootNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SSeqNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureProvider;
import org.springframework.ide.vscode.yaml.util.YamlIndentUtil;
import org.springframework.ide.vscode.commons.yaml.path.YamlPath;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvider;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNodeType;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SRootNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SSeqNode;
import org.springframework.ide.vscode.commons.yaml.util.YamlIndentUtil;
/**
* Implements {@link ICompletionEngine} for .yml file, based on a YamlAssistContextProvider

22
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/completion/YamlPathEdits.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlPathEdits.java
View File

@@ -8,21 +8,21 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.completion;
package org.springframework.ide.vscode.commons.yaml.completion;
import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits;
import org.springframework.ide.vscode.commons.languageserver.util.IRegion;
import org.springframework.ide.vscode.commons.util.Assert;
import org.springframework.ide.vscode.yaml.path.YamlPath;
import org.springframework.ide.vscode.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.yaml.path.YamlPathSegment.YamlPathSegmentType;
import org.springframework.ide.vscode.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SChildBearingNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNodeType;
import org.springframework.ide.vscode.yaml.util.YamlIndentUtil;
import org.springframework.ide.vscode.yaml.util.YamlUtil;
import org.springframework.ide.vscode.commons.yaml.path.YamlPath;
import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment.YamlPathSegmentType;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SChildBearingNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNodeType;
import org.springframework.ide.vscode.commons.yaml.util.YamlIndentUtil;
import org.springframework.ide.vscode.commons.yaml.util.YamlUtil;
/**
* Helper class that provides methods for creating the edits in a YamlDocument that

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/KeyAliases.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/KeyAliases.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.path;
package org.springframework.ide.vscode.commons.yaml.path;
import java.util.Collections;

4
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlNavigable.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlNavigable.java
View File

@@ -8,9 +8,9 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.path;
package org.springframework.ide.vscode.commons.yaml.path;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode;
/**
* Different types of things (e.g. {@link ApplicationYamlAssistContext}, {@link SNode} ...) can

14
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlPath.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPath.java
View File

@@ -8,18 +8,18 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.path;
package org.springframework.ide.vscode.commons.yaml.path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.springframework.ide.vscode.yaml.ast.NodeRef;
import org.springframework.ide.vscode.yaml.ast.NodeRef.RootRef;
import org.springframework.ide.vscode.yaml.ast.NodeRef.SeqRef;
import org.springframework.ide.vscode.yaml.ast.NodeRef.TupleValueRef;
import org.springframework.ide.vscode.yaml.ast.NodeUtil;
import org.springframework.ide.vscode.yaml.path.YamlPathSegment.YamlPathSegmentType;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef;
import org.springframework.ide.vscode.commons.yaml.ast.NodeUtil;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.RootRef;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.SeqRef;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.TupleValueRef;
import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment.YamlPathSegmentType;
/**
* @author Kris De Volder

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/path/YamlPathSegment.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPathSegment.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.path;
package org.springframework.ide.vscode.commons.yaml.path;
/**
* A YamlPathSegment is a 'primitive' NodeNavigator operation.

14
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/SchemaBasedYamlASTReconciler.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java
View File

@@ -1,4 +1,4 @@
package org.springframework.ide.vscode.yaml.reconcile;
package org.springframework.ide.vscode.commons.yaml.reconcile;
import java.util.ArrayList;
import java.util.List;
@@ -8,12 +8,12 @@ import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemC
import org.springframework.ide.vscode.commons.util.ExceptionUtil;
import org.springframework.ide.vscode.commons.util.StringUtil;
import org.springframework.ide.vscode.commons.util.ValueParser;
import org.springframework.ide.vscode.yaml.ast.NodeUtil;
import org.springframework.ide.vscode.yaml.ast.YamlFileAST;
import org.springframework.ide.vscode.yaml.schema.YType;
import org.springframework.ide.vscode.yaml.schema.YTypeUtil;
import org.springframework.ide.vscode.yaml.schema.YTypedProperty;
import org.springframework.ide.vscode.yaml.schema.YamlSchema;
import org.springframework.ide.vscode.commons.yaml.ast.NodeUtil;
import org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST;
import org.springframework.ide.vscode.commons.yaml.schema.YType;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil;
import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty;
import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.NodeTuple;

7
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlASTReconciler.java Normal file
View File

@@ -0,0 +1,7 @@
package org.springframework.ide.vscode.commons.yaml.reconcile;
import org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST;
public interface YamlASTReconciler {
void reconcile(YamlFileAST ast);
}

6
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlReconcileEngine.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlReconcileEngine.java
View File

@@ -1,4 +1,4 @@
package org.springframework.ide.vscode.yaml.reconcile;
package org.springframework.ide.vscode.commons.yaml.reconcile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -6,8 +6,8 @@ import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemC
import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcileEngine;
import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem;
import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
import org.springframework.ide.vscode.yaml.ast.YamlASTProvider;
import org.springframework.ide.vscode.yaml.ast.YamlFileAST;
import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider;
import org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST;
import org.yaml.snakeyaml.error.Mark;
import org.yaml.snakeyaml.parser.ParserException;
import org.yaml.snakeyaml.scanner.ScannerException;

6
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlSchemaBasedReconcileEngine.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaBasedReconcileEngine.java
View File

@@ -1,10 +1,10 @@
package org.springframework.ide.vscode.yaml.reconcile;
package org.springframework.ide.vscode.commons.yaml.reconcile;
import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector;
import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem;
import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
import org.springframework.ide.vscode.yaml.ast.YamlASTProvider;
import org.springframework.ide.vscode.yaml.schema.YamlSchema;
import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider;
import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema;
/**
* @author Kris De Volder

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlSchemaProblems.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java
View File

@@ -1,4 +1,4 @@
package org.springframework.ide.vscode.yaml.reconcile;
package org.springframework.ide.vscode.commons.yaml.reconcile;
import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity;
import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemType;

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/BasicYValueHint.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/BasicYValueHint.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.schema;
package org.springframework.ide.vscode.commons.yaml.schema;
public class BasicYValueHint implements YValueHint {

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YType.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YType.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.schema;
package org.springframework.ide.vscode.commons.yaml.schema;
/**
* Marker interface for objects that carry 'type information'.

4
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeFactory.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.schema;
package org.springframework.ide.vscode.commons.yaml.schema;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,7 +24,7 @@ import javax.inject.Provider;
import org.springframework.ide.vscode.commons.util.EnumValueParser;
import org.springframework.ide.vscode.commons.util.HtmlSnippet;
import org.springframework.ide.vscode.commons.util.ValueParser;
import org.springframework.ide.vscode.yaml.util.DescriptionProviders;
import org.springframework.ide.vscode.commons.yaml.util.DescriptionProviders;
/**
* Static utility method for creating YType objects representing either

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypeUtil.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeUtil.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.schema;
package org.springframework.ide.vscode.commons.yaml.schema;
import java.util.List;
import java.util.Map;

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YTypedProperty.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypedProperty.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.schema;
package org.springframework.ide.vscode.commons.yaml.schema;
import org.springframework.ide.vscode.commons.util.HtmlSnippet;

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YValueHint.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YValueHint.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.schema;
package org.springframework.ide.vscode.commons.yaml.schema;
public interface YValueHint {

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/schema/YamlSchema.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YamlSchema.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.schema;
package org.springframework.ide.vscode.commons.yaml.schema;
/**
* A 'schema' provides a toplevel type, which dictates the valid structure of a

4
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlDocument.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlDocument.java
View File

@@ -8,13 +8,13 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.structure;
package org.springframework.ide.vscode.commons.yaml.structure;
import org.springframework.ide.vscode.commons.languageserver.util.BadLocationException;
import org.springframework.ide.vscode.commons.languageserver.util.DocumentUtil;
import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
import org.springframework.ide.vscode.commons.languageserver.util.IRegion;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SRootNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SRootNode;
/**
* Wraps around a IDocument which is presumed to contain YML content and provides

12
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParser.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureParser.java
View File

@@ -1,4 +1,4 @@
package org.springframework.ide.vscode.yaml.structure;
package org.springframework.ide.vscode.commons.yaml.structure;
import java.io.StringWriter;
import java.io.Writer;
@@ -14,11 +14,11 @@ import org.springframework.ide.vscode.commons.languageserver.util.IRegion;
import org.springframework.ide.vscode.commons.util.Assert;
import org.springframework.ide.vscode.commons.util.CollectionUtil;
import org.springframework.ide.vscode.commons.util.StringUtil;
import org.springframework.ide.vscode.yaml.path.KeyAliases;
import org.springframework.ide.vscode.yaml.path.YamlNavigable;
import org.springframework.ide.vscode.yaml.path.YamlPath;
import org.springframework.ide.vscode.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.yaml.util.YamlIndentUtil;
import org.springframework.ide.vscode.commons.yaml.path.KeyAliases;
import org.springframework.ide.vscode.commons.yaml.path.YamlNavigable;
import org.springframework.ide.vscode.commons.yaml.path.YamlPath;
import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.commons.yaml.util.YamlIndentUtil;
/**
* A robust, coarse-grained parser that guesses the structure of a

6
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/structure/YamlStructureProvider.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureProvider.java
View File

@@ -8,10 +8,10 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.structure;
package org.springframework.ide.vscode.commons.yaml.structure;
import org.springframework.ide.vscode.yaml.path.KeyAliases;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SRootNode;
import org.springframework.ide.vscode.commons.yaml.path.KeyAliases;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SRootNode;
/**
* @author Kris De Volder

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/DescriptionProviders.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/DescriptionProviders.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.util;
package org.springframework.ide.vscode.commons.yaml.util;
import static org.springframework.ide.vscode.commons.util.HtmlSnippet.*;

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/IOUtil.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/IOUtil.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal Software, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.util;
package org.springframework.ide.vscode.commons.yaml.util;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;

4
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlIndentUtil.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlIndentUtil.java
View File

@@ -8,10 +8,10 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.util;
package org.springframework.ide.vscode.commons.yaml.util;
import org.springframework.ide.vscode.commons.util.Assert;
import org.springframework.ide.vscode.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
import com.google.common.base.Strings;

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/util/YamlUtil.java → vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlUtil.java
View File

@@ -8,7 +8,7 @@
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.yaml.util;
package org.springframework.ide.vscode.commons.yaml.util;
/**
* @author Kris De Volder

7
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/YamlASTReconciler.java
View File

@@ -1,7 +0,0 @@
package org.springframework.ide.vscode.yaml.reconcile;
import org.springframework.ide.vscode.yaml.ast.YamlFileAST;
public interface YamlASTReconciler {
void reconcile(YamlFileAST ast);
}

17
vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParserTest.java
View File

@@ -22,13 +22,16 @@ import java.util.regex.Pattern;
import org.junit.Test;
import org.springframework.ide.vscode.commons.languageserver.util.TextDocument;
import org.springframework.ide.vscode.yaml.path.YamlPath;
import org.springframework.ide.vscode.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SChildBearingNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SDocNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SRootNode;
import org.springframework.ide.vscode.commons.yaml.path.YamlPath;
import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvider;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SChildBearingNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SDocNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SRootNode;
public class YamlStructureParserTest {

4
vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/ApplicationYamlLanguageServer.java
View File

@@ -11,8 +11,8 @@ import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguage
import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService;
import org.springframework.ide.vscode.commons.languageserver.util.TextDocument;
import org.springframework.ide.vscode.commons.util.Futures;
import org.springframework.ide.vscode.yaml.ast.YamlASTProvider;
import org.springframework.ide.vscode.yaml.ast.YamlParser;
import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider;
import org.springframework.ide.vscode.commons.yaml.ast.YamlParser;
import org.springframework.ide.vscode.yaml.reconcile.ApplicationYamlReconcileEngine;
import org.yaml.snakeyaml.Yaml;

18
vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
View File

@@ -20,16 +20,16 @@ import org.springframework.ide.vscode.commons.languageserver.quickfix.ProblemFix
import org.springframework.ide.vscode.commons.languageserver.quickfix.QuickfixContext;
import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
import org.springframework.ide.vscode.commons.util.Log;
import org.springframework.ide.vscode.yaml.completion.YamlPathEdits;
import org.springframework.ide.vscode.yaml.path.YamlPath;
import org.springframework.ide.vscode.commons.yaml.completion.YamlPathEdits;
import org.springframework.ide.vscode.commons.yaml.path.YamlPath;
import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvider;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SChildBearingNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SDocNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser.SNodeType;
import org.springframework.ide.vscode.yaml.reconcile.SpringPropertyProblem;
import org.springframework.ide.vscode.yaml.structure.YamlDocument;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SChildBearingNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SDocNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SKeyNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNode;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser.SNodeType;
import org.springframework.ide.vscode.yaml.structure.YamlStructureProvider;
import io.typefox.lsapi.CompletionItemKind;

15
vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlASTReconciler.java
View File

@@ -1,7 +1,7 @@
package org.springframework.ide.vscode.yaml.reconcile;
import static org.springframework.ide.vscode.yaml.ast.NodeUtil.asScalar;
import static org.springframework.ide.vscode.yaml.ast.YamlFileAST.getChildren;
import static org.springframework.ide.vscode.commons.yaml.ast.NodeUtil.asScalar;
import static org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST.getChildren;
import static org.springframework.ide.vscode.yaml.reconcile.SpringPropertiesProblemType.YAML_DEPRECATED;
import static org.springframework.ide.vscode.yaml.reconcile.SpringPropertiesProblemType.YAML_DUPLICATE_KEY;
@@ -21,11 +21,12 @@ import org.springframework.ide.vscode.application.properties.metadata.types.Type
import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector;
import org.springframework.ide.vscode.commons.util.StringUtil;
import org.springframework.ide.vscode.commons.util.ValueParser;
import org.springframework.ide.vscode.yaml.ast.NodeRef;
import org.springframework.ide.vscode.yaml.ast.NodeRef.Kind;
import org.springframework.ide.vscode.yaml.ast.NodeRef.TupleValueRef;
import org.springframework.ide.vscode.yaml.ast.NodeUtil;
import org.springframework.ide.vscode.yaml.ast.YamlFileAST;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef;
import org.springframework.ide.vscode.commons.yaml.ast.NodeUtil;
import org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.Kind;
import org.springframework.ide.vscode.commons.yaml.ast.NodeRef.TupleValueRef;
import org.springframework.ide.vscode.commons.yaml.reconcile.YamlASTReconciler;
import org.springframework.ide.vscode.yaml.quickfix.ReplaceDeprecatedYamlQuickfix;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;

4
vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/yaml/reconcile/ApplicationYamlReconcileEngine.java
View File

@@ -20,8 +20,10 @@ import org.springframework.ide.vscode.application.properties.metadata.util.Fuzzy
import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector;
import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem;
import org.springframework.ide.vscode.commons.languageserver.util.IDocument;
import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider;
import org.springframework.ide.vscode.commons.yaml.reconcile.YamlASTReconciler;
import org.springframework.ide.vscode.commons.yaml.reconcile.YamlReconcileEngine;
import org.springframework.ide.vscode.yaml.ApplicationYamlProblems;
import org.springframework.ide.vscode.yaml.ast.YamlASTProvider;
public class ApplicationYamlReconcileEngine extends YamlReconcileEngine {

18
vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYamlLanguageServer.java
View File

@@ -8,15 +8,15 @@ import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcil
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService;
import org.springframework.ide.vscode.commons.languageserver.util.TextDocument;
import org.springframework.ide.vscode.yaml.ast.YamlASTProvider;
import org.springframework.ide.vscode.yaml.ast.YamlParser;
import org.springframework.ide.vscode.yaml.completion.SchemaBasedYamlAssistContextProvider;
import org.springframework.ide.vscode.yaml.completion.YamlAssistContextProvider;
import org.springframework.ide.vscode.yaml.completion.YamlCompletionEngine;
import org.springframework.ide.vscode.yaml.reconcile.YamlSchemaBasedReconcileEngine;
import org.springframework.ide.vscode.yaml.schema.YValueHint;
import org.springframework.ide.vscode.yaml.schema.YamlSchema;
import org.springframework.ide.vscode.yaml.structure.YamlStructureProvider;
import org.springframework.ide.vscode.commons.yaml.ast.YamlASTProvider;
import org.springframework.ide.vscode.commons.yaml.ast.YamlParser;
import org.springframework.ide.vscode.commons.yaml.completion.SchemaBasedYamlAssistContextProvider;
import org.springframework.ide.vscode.commons.yaml.completion.YamlAssistContextProvider;
import org.springframework.ide.vscode.commons.yaml.completion.YamlCompletionEngine;
import org.springframework.ide.vscode.commons.yaml.reconcile.YamlSchemaBasedReconcileEngine;
import org.springframework.ide.vscode.commons.yaml.schema.YValueHint;
import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvider;
import org.yaml.snakeyaml.Yaml;
import com.google.common.collect.ImmutableList;

18
vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/ManifestYmlSchema.java
View File

@@ -16,15 +16,15 @@ import java.util.Set;
import javax.inject.Provider;
import org.springframework.ide.vscode.commons.util.HtmlSnippet;
import org.springframework.ide.vscode.yaml.schema.YType;
import org.springframework.ide.vscode.yaml.schema.YTypeFactory;
import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YAtomicType;
import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YBeanType;
import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YTypedPropertyImpl;
import org.springframework.ide.vscode.yaml.schema.YTypeUtil;
import org.springframework.ide.vscode.yaml.schema.YValueHint;
import org.springframework.ide.vscode.yaml.schema.YamlSchema;
import org.springframework.ide.vscode.yaml.util.DescriptionProviders;
import org.springframework.ide.vscode.commons.yaml.schema.YType;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil;
import org.springframework.ide.vscode.commons.yaml.schema.YValueHint;
import org.springframework.ide.vscode.commons.yaml.schema.YamlSchema;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YAtomicType;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YBeanType;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YTypedPropertyImpl;
import org.springframework.ide.vscode.commons.yaml.util.DescriptionProviders;
import com.google.common.collect.ImmutableSet;

4
vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/cloudfoundry/manifest/editor/VscodeCompletionEngineAdapter.java
View File

@@ -15,8 +15,8 @@ import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguage
import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService;
import org.springframework.ide.vscode.commons.languageserver.util.TextDocument;
import org.springframework.ide.vscode.commons.util.Futures;
import org.springframework.ide.vscode.yaml.completion.DefaultCompletionFactory;
import org.springframework.ide.vscode.yaml.structure.YamlStructureParser;
import org.springframework.ide.vscode.commons.yaml.completion.DefaultCompletionFactory;
import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureParser;
import io.typefox.lsapi.CompletionItem;
import io.typefox.lsapi.CompletionList;

8
vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYmlSchemaTest.java
View File

@@ -21,10 +21,10 @@ import java.util.Map;
import org.junit.Test;
import org.springframework.ide.vscode.cloudfoundry.manifest.editor.ManifestYmlSchema;
import org.springframework.ide.vscode.commons.util.StringUtil;
import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YBeanType;
import org.springframework.ide.vscode.yaml.schema.YTypeFactory.YSeqType;
import org.springframework.ide.vscode.yaml.schema.YTypedProperty;
import org.springframework.ide.vscode.yaml.util.DescriptionProviders;
import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YBeanType;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeFactory.YSeqType;
import org.springframework.ide.vscode.commons.yaml.util.DescriptionProviders;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSet.Builder;