浏览代码

[display] add isIntersectionType to CRStructExtension (#7314)

closes #7313
Jens Fischer 7 年之前
父节点
当前提交
14c610b3e5
共有 3 个文件被更改,包括 7 次插入5 次删除
  1. 1 1
      src/compiler/main.ml
  2. 4 2
      src/core/displayTypes.ml
  3. 2 2
      src/typing/typeload.ml

+ 1 - 1
src/compiler/main.ml

@@ -996,7 +996,7 @@ with
 			| CRTypeHint
 			| CRExtends
 			| CRImplements
-			| CRStructExtension
+			| CRStructExtension _
 			| CRImport
 			| CRUsing
 			| CRNew

+ 4 - 2
src/core/displayTypes.ml

@@ -72,7 +72,7 @@ module CompletionResultKind = struct
 		| CRTypeHint
 		| CRExtends
 		| CRImplements
-		| CRStructExtension
+		| CRStructExtension of bool
 		| CRImport
 		| CRUsing
 		| CRNew
@@ -118,7 +118,9 @@ module CompletionResultKind = struct
 			| CRTypeHint -> 4,None
 			| CRExtends -> 5,None
 			| CRImplements -> 6,None
-			| CRStructExtension -> 7,None
+			| CRStructExtension isIntersectionType -> 7,Some (jobject [
+					"isIntersectionType",jbool isIntersectionType
+				])
 			| CRImport -> 8,None
 			| CRUsing -> 9,None
 			| CRNew -> 10,None

+ 2 - 2
src/typing/typeload.ml

@@ -348,7 +348,7 @@ and load_complex_type' ctx allow_display (t,p) =
 					| ITType({kind = Struct},_) -> true
 					| _ -> false
 				) l in
-				raise_fields l CRStructExtension p
+				raise_fields l (CRStructExtension true) p
 		) tl in
 		let tr = ref None in
 		let t = TMono tr in
@@ -400,7 +400,7 @@ and load_complex_type' ctx allow_display (t,p) =
 						| ITType({kind = Struct},_) -> true
 						| _ -> false
 					) l in
-					raise_fields l CRStructExtension p
+					raise_fields l (CRStructExtension false) p
 			) tl in
 			let tr = ref None in
 			let t = TMono tr in