Fix merge error

src/vs/workbench/api/node/extHost.api.impl.ts

@@ -559,14 +559,13 @@ export function createApiFactory(
 				return extHostFileSystem.registerDeprecatedFileSystemProvider(scheme, provider);
 			}),
 			registerSearchProvider: proposedApiFunction(extension, (scheme, provider) => {
-				return extHostFileSystem.registerSearchProvider(scheme, provider);
+				return extHostSearch.registerSearchProvider(scheme, provider);
 			}),
 			registerDocumentCommentProvider: proposedApiFunction(extension, (provider: vscode.DocumentCommentProvider) => {
 				return exthostCommentProviders.registerDocumentCommentProvider(provider);
 			}),
 			registerWorkspaceCommentProvider: proposedApiFunction(extension, (provider: vscode.WorkspaceCommentProvider) => {
 				return exthostCommentProviders.registerWorkspaceCommentProvider(provider);
-				return extHostSearch.registerSearchProvider(scheme, provider);
 			})
 		};
 
@@ -712,10 +711,9 @@ export function createApiFactory(
 			FileChangeType: extHostTypes.FileChangeType,
 			FileSystemError: extHostTypes.FileSystemError,
 			FoldingRange: extHostTypes.FoldingRange,
-			FoldingRangeType: extHostTypes.FoldingRangeType,
+			FoldingRangeKind: extHostTypes.FoldingRangeKind,
 
-			CommentThreadCollapsibleState: extHostTypes.CommentThreadCollapsibleState,
-			FoldingRangeKind: extHostTypes.FoldingRangeKind
+			CommentThreadCollapsibleState: extHostTypes.CommentThreadCollapsibleState
 		};
 	};
 }

src/vs/workbench/api/node/extHost.protocol.ts

@@ -936,6 +936,5 @@ export const ExtHostContext = {
 	ExtHostWebviews: createExtId<ExtHostWebviewsShape>('ExtHostWebviews'),
 	ExtHostProgress: createMainId<ExtHostProgressShape>('ExtHostProgress'),
 	ExtHostComments: createMainId<ExtHostCommentsShape>('ExtHostComments'),
-	ExtHostUrls: createExtId<ExtHostUrlsShape>('ExtHostUrls'),
-	ExtHostProgress: createMainId<ExtHostProgressShape>('ExtHostProgress')
+	ExtHostUrls: createExtId<ExtHostUrlsShape>('ExtHostUrls')
 };