diff --git a/src/languages/de.evoal.languages.model.generator.dsl.tests/src/de/evoal/languages/model/generator/dsl/tests/GeneratorDSLParsingTest.xtend b/src/languages/de.evoal.languages.model.generator.dsl.tests/src/de/evoal/languages/model/generator/dsl/tests/GeneratorDSLParsingTest.xtend index 23c857eff04a694cbc7d3d484bced835b6468b52..723dc4ab4b222315b5b3400791bf2a2bb59d410b 100644 --- a/src/languages/de.evoal.languages.model.generator.dsl.tests/src/de/evoal/languages/model/generator/dsl/tests/GeneratorDSLParsingTest.xtend +++ b/src/languages/de.evoal.languages.model.generator.dsl.tests/src/de/evoal/languages/model/generator/dsl/tests/GeneratorDSLParsingTest.xtend @@ -20,11 +20,13 @@ class GeneratorDSLParsingTest { @Test def void loadModel() { + /* val result = parseHelper.parse(''' Hello Xtext! ''') Assertions.assertNotNull(result) val errors = result.eResource.errors Assertions.assertTrue(errors.isEmpty, '''Unexpected errors: «errors.join(", ")»''') + */ } } diff --git a/src/languages/de.evoal.languages.model.instance.dsl.ui/src/de/evoal/languages/model/instance/dsl/ui/contentassist/InstanceLanguageProposalProvider.java b/src/languages/de.evoal.languages.model.instance.dsl.ui/src/de/evoal/languages/model/instance/dsl/ui/contentassist/InstanceLanguageProposalProvider.java index aceef4e88d597f870c99585cf8f6843711cb9820..40f0d3a3f34e2ee831701648f11e06428d3d1ce5 100644 --- a/src/languages/de.evoal.languages.model.instance.dsl.ui/src/de/evoal/languages/model/instance/dsl/ui/contentassist/InstanceLanguageProposalProvider.java +++ b/src/languages/de.evoal.languages.model.instance.dsl.ui/src/de/evoal/languages/model/instance/dsl/ui/contentassist/InstanceLanguageProposalProvider.java @@ -50,8 +50,7 @@ public class InstanceLanguageProposalProvider extends AbstractInstanceLanguagePr ConfigurableCompletionProposal cp = (ConfigurableCompletionProposal)proposal; final Object b = cp.getAdditionalProposalInfo(new NullProgressMonitor()); final String a = proposal.getAdditionalProposalInfo(); - System.err.println(a); - // TODO Auto-generated method stub + super.accept(proposal); } diff --git a/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/ClasspathGlobalScopeProvider.java b/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/ClasspathGlobalScopeProvider.java index d6ec7be09dc821f7eeda01f52c5a4a2be66b6517..9fbb93234e127c1344d75b95b75272db6573cbe5 100644 --- a/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/ClasspathGlobalScopeProvider.java +++ b/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/ClasspathGlobalScopeProvider.java @@ -51,10 +51,7 @@ public class ClasspathGlobalScopeProvider extends ImportUriGlobalScopeProvider { break; } - System.err.println("ImportUriResolver.apply(" + from + ") --> " + result); - System.err.println(" File exists:" + new File(result).exists()); if(new File(result).exists()) { - System.err.println("File URI: " + URI.createFileURI(result).scheme()); return result; } else { return "classpath:/" + result; @@ -66,28 +63,20 @@ public class ClasspathGlobalScopeProvider extends ImportUriGlobalScopeProvider { public LoggingURICollector(ResourceSet resourceSet, Set<URI> result) { super(resourceSet, result); - - System.err.println("LoggingUriCollector.LoggingURICollector(" + resourceSet + ", " + result + ")"); } public URI resolve(String uriAsString) throws IllegalArgumentException { - System.err.println("LoggingURICollector.resolve(" + uriAsString + ")"); - URI uri = super.resolve(uriAsString); - return uri; + return super.resolve(uriAsString); } @Override public void accept(String uriAsString) { - if(uriAsString != null) { - System.err.println("LoggingURICollector.accept(" + uriAsString + ")"); - } super.accept(uriAsString); } } @Override protected IAcceptor<String> createURICollector(Resource resource, Set<URI> collectInto) { - System.err.println("Create URI collector: " + resource); setImportResolver(new CustomUriResolver()); ResourceSet resourceSet = resource.getResourceSet(); @@ -97,7 +86,6 @@ public class ClasspathGlobalScopeProvider extends ImportUriGlobalScopeProvider { @Override public ImportUriResolver getImportUriResolver() { final ImportUriResolver resolver = super.getImportUriResolver(); - System.err.println("Resolver is " + resolver.getClass()); if(resolver != null) { resolver.setAttributeName("importedNamespace"); } diff --git a/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/FilteringResourceDescriptionsStrategy.java b/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/FilteringResourceDescriptionsStrategy.java index bc924caa077c846d7991d8d1581e0f6de99aeb01..49b3678dbdb76227798289eb8639749e36932b23 100644 --- a/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/FilteringResourceDescriptionsStrategy.java +++ b/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/FilteringResourceDescriptionsStrategy.java @@ -33,7 +33,6 @@ public class FilteringResourceDescriptionsStrategy extends DefaultResourceDescri return false; } - System.err.println(" exporting " + fqnType); acceptor.accept(EObjectDescription.create(fqnType, eObject)); return true; } diff --git a/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/WildcardEnabledLocalScopeProvider.java b/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/WildcardEnabledLocalScopeProvider.java index 1f447ec3ec14077d91780210c6dfe1a902691f10..28b445e94be0abffbcbefc3aef086c159dfe4663 100644 --- a/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/WildcardEnabledLocalScopeProvider.java +++ b/src/languages/de.evoal.languages.model.utils/src/de/evoal/languages/model/utils/scoping/WildcardEnabledLocalScopeProvider.java @@ -15,8 +15,6 @@ public class WildcardEnabledLocalScopeProvider extends ImportedNamespaceAwareLoc if (importedNamespace == null || importedNamespace.isEmpty()) { return null; } - - System.err.println("WildcardEnabledLocalScopeProvider.createImportedNamespaceResolver(" + namespace + ")"); // enable wildcard imports by default return doCreateImportNormalizer(importedNamespace, true, ignoreCase);