瀏覽代碼

[display] fix compilation

Simon Krajewski 5 年之前
父節點
當前提交
055a149cb4
共有 2 個文件被更改,包括 0 次插入15 次删除
  1. 0 10
      src/compiler/displayOutput.ml
  2. 0 5
      src/context/display/displayJson.ml

+ 0 - 10
src/compiler/displayOutput.ml

@@ -229,7 +229,6 @@ let handle_display_argument com file_pos pre_compilation did_something =
 		did_something := true;
 		did_something := true;
 		(try Memory.display_memory com with e -> prerr_endline (Printexc.get_backtrace ()));
 		(try Memory.display_memory com with e -> prerr_endline (Printexc.get_backtrace ()));
 	| "diagnostics" ->
 	| "diagnostics" ->
-		Common.define com Define.NoCOpt;
 		com.display <- DisplayMode.create (DMDiagnostics []);
 		com.display <- DisplayMode.create (DMDiagnostics []);
 		Parser.display_mode := DMDiagnostics [];
 		Parser.display_mode := DMDiagnostics [];
 	| _ ->
 	| _ ->
@@ -239,32 +238,24 @@ let handle_display_argument com file_pos pre_compilation did_something =
 		let pos, smode = try ExtString.String.split pos "@" with _ -> pos,"" in
 		let pos, smode = try ExtString.String.split pos "@" with _ -> pos,"" in
 		let mode = match smode with
 		let mode = match smode with
 			| "position" ->
 			| "position" ->
-				Common.define com Define.NoCOpt;
 				DMDefinition
 				DMDefinition
 			| "usage" ->
 			| "usage" ->
-				Common.define com Define.NoCOpt;
 				DMUsage (false,false,false)
 				DMUsage (false,false,false)
 			(*| "rename" ->
 			(*| "rename" ->
-				Common.define com Define.NoCOpt;
 				DMUsage true*)
 				DMUsage true*)
 			| "package" ->
 			| "package" ->
 				DMPackage
 				DMPackage
 			| "type" ->
 			| "type" ->
-				Common.define com Define.NoCOpt;
 				DMHover
 				DMHover
 			| "toplevel" ->
 			| "toplevel" ->
 				DMDefault
 				DMDefault
 			| "module-symbols" ->
 			| "module-symbols" ->
-				Common.define com Define.NoCOpt;
 				DMModuleSymbols None;
 				DMModuleSymbols None;
 			| "diagnostics" ->
 			| "diagnostics" ->
-				Common.define com Define.NoCOpt;
 				DMDiagnostics [file_unique];
 				DMDiagnostics [file_unique];
 			| "statistics" ->
 			| "statistics" ->
-				Common.define com Define.NoCOpt;
 				DMStatistics
 				DMStatistics
 			| "signature" ->
 			| "signature" ->
-				Common.define com Define.NoCOpt;
 				DMSignature
 				DMSignature
 			| "" ->
 			| "" ->
 				DMDefault
 				DMDefault
@@ -274,7 +265,6 @@ let handle_display_argument com file_pos pre_compilation did_something =
 					| "resolve" ->
 					| "resolve" ->
 						DMResolve arg
 						DMResolve arg
 					| "workspace-symbols" ->
 					| "workspace-symbols" ->
-						Common.define com Define.NoCOpt;
 						DMModuleSymbols (Some arg)
 						DMModuleSymbols (Some arg)
 					| _ ->
 					| _ ->
 						DMDefault
 						DMDefault

+ 0 - 5
src/context/display/displayJson.ml

@@ -122,22 +122,18 @@ let handler =
 			hctx.display#enable_display DMDefault;
 			hctx.display#enable_display DMDefault;
 		);
 		);
 		"display/definition", (fun hctx ->
 		"display/definition", (fun hctx ->
-			Common.define hctx.com Define.NoCOpt;
 			hctx.display#set_display_file false true;
 			hctx.display#set_display_file false true;
 			hctx.display#enable_display DMDefinition;
 			hctx.display#enable_display DMDefinition;
 		);
 		);
 		"display/implementation", (fun hctx ->
 		"display/implementation", (fun hctx ->
-			Common.define hctx.com Define.NoCOpt;
 			hctx.display#set_display_file false true;
 			hctx.display#set_display_file false true;
 			hctx.display#enable_display (DMImplementation);
 			hctx.display#enable_display (DMImplementation);
 		);
 		);
 		"display/typeDefinition", (fun hctx ->
 		"display/typeDefinition", (fun hctx ->
-			Common.define hctx.com Define.NoCOpt;
 			hctx.display#set_display_file false true;
 			hctx.display#set_display_file false true;
 			hctx.display#enable_display DMTypeDefinition;
 			hctx.display#enable_display DMTypeDefinition;
 		);
 		);
 		"display/references", (fun hctx ->
 		"display/references", (fun hctx ->
-			Common.define hctx.com Define.NoCOpt;
 			hctx.display#set_display_file false true;
 			hctx.display#set_display_file false true;
 			match hctx.jsonrpc#get_opt_param (fun () -> hctx.jsonrpc#get_string_param "kind") "normal" with
 			match hctx.jsonrpc#get_opt_param (fun () -> hctx.jsonrpc#get_string_param "kind") "normal" with
 			| "withBaseAndDescendants" ->
 			| "withBaseAndDescendants" ->
@@ -148,7 +144,6 @@ let handler =
 				hctx.display#enable_display (DMUsage (false,false,false));
 				hctx.display#enable_display (DMUsage (false,false,false));
 		);
 		);
 		"display/hover", (fun hctx ->
 		"display/hover", (fun hctx ->
-			Common.define hctx.com Define.NoCOpt;
 			hctx.display#set_display_file false true;
 			hctx.display#set_display_file false true;
 			hctx.display#enable_display DMHover;
 			hctx.display#enable_display DMHover;
 		);
 		);