Completion doesn't use file cache for included XML schema.

Signed-off-by: azerr <[email protected]>

org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/extensions/contentmodel/model/ContentModelManager.java

@@ -117,32 +117,32 @@ public boolean dependsOnGrammar(DOMDocument document, String grammarURI) {
 	private CMDocument findCMDocument(String uri, String publicId, String systemId,
 			ContentModelProvider modelProvider) {
 		// Resolve the XML Schema/DTD uri (file, http, etc)
-		String key = resolverManager.resolve(uri, publicId, systemId);
-		if (key == null) {
+		String resolvedUri = resolverManager.resolve(uri, publicId, systemId);
+		if (resolvedUri == null) {
 			return null;
 		}
 		// the XML Schema, DTD can be resolved
 		if (modelProvider == null) {
 			// the model provider cannot be get with standard mean (xsi:schemaLocation,
 			// xsi:noNamespaceSchemaLocation, doctype)
 			// try to get it by using extension (ex: .xsd, .dtd)
-			modelProvider = getModelProviderByURI(key);
+			modelProvider = getModelProviderByURI(resolvedUri);
 		}
 		if (modelProvider == null) {
 			return null;
 		}
 		// Try to get the document from the cache
-		CMDocument cmDocument = getCMDocumentFromCache(key);
+		CMDocument cmDocument = getCMDocumentFromCache(resolvedUri);
 		if (cmDocument != null) {
 			return cmDocument;
 		}
-		boolean isFileResource = URIUtils.isFileResource(uri);
+		boolean isFileResource = URIUtils.isFileResource(resolvedUri);
 		if (!isFileResource && cacheResolverExtension.isUseCache()) {
 			// The DTD/XML Schema comes from http://, ftp:// etc and cache manager is
 			// activated
 			// Try to load the DTD/XML Schema with the cache manager
 			try {
-				Path file = cacheResolverExtension.getCachedResource(key);
+				Path file = cacheResolverExtension.getCachedResource(resolvedUri);
 				if (file != null) {
 					cmDocument = modelProvider.createCMDocument(file.toFile().getPath());
 				}
@@ -151,14 +151,14 @@ private CMDocument findCMDocument(String uri, String publicId, String systemId,
 				return null;
 			} catch (Exception e) {
 				// other error like network which is not available
-				cmDocument = modelProvider.createCMDocument(key);
+				cmDocument = modelProvider.createCMDocument(resolvedUri);
 			}
 		} else {
-			cmDocument = modelProvider.createCMDocument(key);
+			cmDocument = modelProvider.createCMDocument(resolvedUri);
 		}
 		// Cache the document
 		if (cmDocument != null) {
-			cache(key, cmDocument);
+			cache(resolvedUri, cmDocument);
 		}
 		return cmDocument;
 	}