X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FServerSCLValueRequest.java;h=e6cdf6ff5b43712b098594d172a91b7595de63cb;hb=331406ad9dfcb7332a645ddc7029a863ef064d2f;hp=5013f88146bbb232d48d8f27e8883df40fd81421;hpb=66a5745bfefb159ce9d959bc29cbf148614e6fae;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
index 5013f8814..e6cdf6ff5 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
@@ -1,5 +1,6 @@
 package org.simantics.document.server.request;
 
+import java.util.ArrayList;
 import java.util.Map;
 
 import org.simantics.databoard.Bindings;
@@ -28,6 +29,8 @@ import org.simantics.scl.compiler.environment.Environments;
 import org.simantics.scl.compiler.environment.specification.EnvironmentSpecification;
 import org.simantics.scl.compiler.runtime.RuntimeEnvironment;
 import org.simantics.scl.compiler.top.SCLExpressionCompilationException;
+import org.simantics.scl.compiler.types.TMetaVar;
+import org.simantics.scl.compiler.types.TVar;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.kinds.Kinds;
@@ -205,7 +208,9 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
     protected Type getExpectedType(ReadGraph graph, CompilationContext context) throws DatabaseException {
         if(possibleExpectedValueType != null) {
             try {
-                return Environments.getType(context.runtimeEnvironment.getEnvironment(), possibleExpectedValueType);
+                Type type = Environments.getType(context.runtimeEnvironment.getEnvironment(), possibleExpectedValueType);
+                type = Types.instantiate(Types.forAll(Types.freeVars(type).toArray(new TVar[0]), type), new ArrayList<TMetaVar>());
+                return type;
             } catch (SCLExpressionCompilationException e) {
                 LOGGER.error("Could not get type for " + String.valueOf(possibleExpectedValueType), e);
             }