add cache to jsonSchemaService (#59)

Author: joscol

language-service/CHANGELOG.md

@@ -1,6 +1,7 @@
 
 #### 0.5.5
-Better handling of YAML structure errors
+Better handling of YAML structure errors [#PR-58](https://github.com/Microsoft/azure-pipelines-language-server/pull/58)
+Cache schemas to improve performance [#PR-59](https://github.com/Microsoft/azure-pipelines-language-server/pull/59)
 
 #### 0.5.4
 Change schema service to use a schema object instead of a JSON string [#PR-53](https://github.com/Microsoft/azure-pipelines-language-server/pull/53)

language-service/src/services/jsonSchemaService.ts

@@ -227,6 +227,8 @@ export class JSONSchemaService implements IJSONSchemaService {
 	private promiseConstructor: PromiseConstructor;
 	private customSchemaProvider: CustomSchemaProvider;
 
+	private schemaCache: {[resource: string]: ResolvedSchema};
+
 	constructor(requestService: SchemaRequestService, contextService?: WorkspaceContextService, customSchemaProvider?: CustomSchemaProvider, promiseConstructor?: PromiseConstructor) {
 		this.contextService = contextService;
 		this.requestService = requestService;
@@ -239,6 +241,7 @@ export class JSONSchemaService implements IJSONSchemaService {
 		this.filePatternAssociations = [];
 		this.filePatternAssociationById = {};
 		this.registeredSchemasIds = {};
+		this.schemaCache = {};
 	}
 
 	public getRegisteredSchemaIds(filter?: (scheme) => boolean): string[] {
@@ -491,6 +494,11 @@ export class JSONSchemaService implements IJSONSchemaService {
 	}
 
 	public getSchemaForResource(resource: string ): Thenable<ResolvedSchema> {
+
+		if (this.schemaCache.hasOwnProperty(resource)) {
+			return this.promise.resolve(this.schemaCache[resource]);
+		}
+
 		console.log('getSchemaForResource');
 		console.log('resource: ' + resource);
 
@@ -505,7 +513,10 @@ export class JSONSchemaService implements IJSONSchemaService {
 			for (let i = this.filePatternAssociations.length - 1; i >= 0; i--) {
 				let entry = this.filePatternAssociations[i];
 				if (entry.matchesPattern(resource)) {
-					return entry.getCombinedSchema(this).getResolvedSchema();
+					return entry.getCombinedSchema(this).getResolvedSchema().then(resolvedSchema => {
+						this.schemaCache[resource] = resolvedSchema;
+						return this.promise.resolve(resolvedSchema);
+					});
 				}
 			}
 			return this.promise.resolve(null);

language-service/src/services/yamlCompletion.ts

@@ -17,7 +17,7 @@ import { nodeHolder } from "../utils/yamlServiceUtils";
 import { CompletionItem, CompletionItemKind, CompletionList, TextDocument, Position, Range, TextEdit, InsertTextFormat } from 'vscode-languageserver-types';
 
 import * as nls from 'vscode-nls';
-import { YAMLDocument } from '../parser/yamlParser';
+import { YAMLDocument, SingleYAMLDocument } from '../parser/yamlParser';
 
 const localize = nls.loadMessageBundle();
 
@@ -63,7 +63,7 @@ export class YAMLCompletion {
             return Promise.resolve(result);
         }
 
-        const jsonDocument = yamlDocument.documents.length > 0 ? yamlDocument.documents[0] : null;
+        const jsonDocument: SingleYAMLDocument = yamlDocument.documents.length > 0 ? yamlDocument.documents[0] : null;
         if (jsonDocument === null) {
             return Promise.resolve(result);
         }
@@ -229,7 +229,7 @@ export class YAMLCompletion {
         return !!stringArray.some(arrayEntry => arrayEntry === key);
     }
 
-    private getPropertyCompletions(schema: SchemaService.ResolvedSchema, doc, node: Parser.ASTNode, addValue: boolean, collector: CompletionsCollector, separatorAfter: string): void {
+    private getPropertyCompletions(schema: SchemaService.ResolvedSchema, doc: SingleYAMLDocument, node: Parser.ASTNode, addValue: boolean, collector: CompletionsCollector, separatorAfter: string): void {
         const nodeProperties: Parser.PropertyASTNode[] = (<Parser.ObjectASTNode>node).properties;
         const hasMatchingProperty = (key: string, propSchema: JSONSchema): boolean => {
             return nodeProperties.some((propertyNode: Parser.PropertyASTNode): boolean => {
@@ -265,7 +265,7 @@ export class YAMLCompletion {
                 if (schemaProperties) {
                     Object.keys(schemaProperties).forEach((key: string) => {
                         //check for more than one property because the placeholder will always be in the list
-                        if (s.node.properties.length > 1 || this.arrayIsEmptyOrContainsKey(s.schema.firstProperty, key)) {
+                        if (s.node['properties'].length > 1 || this.arrayIsEmptyOrContainsKey(s.schema.firstProperty, key)) {
                             const propertySchema = schemaProperties[key];
                             if (!propertySchema.deprecationMessage &&
                                 !propertySchema["doNotSuggest"] &&
@@ -285,7 +285,7 @@ export class YAMLCompletion {
         });
     }
 
-    private getValueCompletions(schema: SchemaService.ResolvedSchema, doc, node: Parser.ASTNode, offset: number, document: TextDocument, collector: CompletionsCollector, types: { [type: string]: boolean }): void {
+    private getValueCompletions(schema: SchemaService.ResolvedSchema, doc: SingleYAMLDocument, node: Parser.ASTNode, offset: number, document: TextDocument, collector: CompletionsCollector, types: { [type: string]: boolean }): void {
 
 
         let offsetForSeparator = offset;