1 files changed, 0 insertions, 132 deletions
diff --git a/language-web/src/main/js/xtext/services/ContentAssistService.js b/language-web/src/main/js/xtext/services/ContentAssistService.js
deleted file mode 100644
index 1686570d..00000000
--- a/language-web/src/main/js/xtext/services/ContentAssistService.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 itemis AG (http://www.itemis.eu) and others.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-define(['xtext/services/XtextService', 'jquery'], function(XtextService, jQuery) {
-        /**
-         * Service class for content assist proposals. The proposals are returned as promise of
-         * a Deferred object.
-         */
-        function ContentAssistService(serviceUrl, resourceId, updateService) {
-                this.initialize(serviceUrl, 'assist', resourceId, updateService);
-        }
-        ContentAssistService.prototype = new XtextService();
-        
-        ContentAssistService.prototype.invoke = function(editorContext, params, deferred) {
-                if (deferred === undefined) {
-                        deferred = jQuery.Deferred();
-                }
-                var serverData = {
-                        contentType: params.contentType
-                };
-                if (params.offset)
-                        serverData.caretOffset = params.offset;
-                else
-                        serverData.caretOffset = editorContext.getCaretOffset();
-                var selection = params.selection ? params.selection : editorContext.getSelection();
-                if (selection.start != serverData.caretOffset || selection.end != serverData.caretOffset) {
-                        serverData.selectionStart = selection.start;
-                        serverData.selectionEnd = selection.end;
-                }
-                var currentText;
-                var httpMethod = 'GET';
-                var onComplete = undefined;
-                var knownServerState = editorContext.getServerState();
-                if (params.sendFullText) {
-                        serverData.fullText = editorContext.getText();
-                        httpMethod = 'POST';
-                } else {
-                        serverData.requiredStateId = knownServerState.stateId;
-                        if (this._updateService) {
-                                if (knownServerState.text === undefined || knownServerState.updateInProgress) {
-                                        var self = this;
-                                        this._updateService.addCompletionCallback(function() {
-                                                self.invoke(editorContext, params, deferred);
-                                        });
-                                        return deferred.promise();
-                                }
-                                knownServerState.updateInProgress = true;
-                                onComplete = this._updateService.onComplete.bind(this._updateService);
-                                currentText = editorContext.getText();
-                                this._updateService.computeDelta(knownServerState.text, currentText, serverData);
-                                if (serverData.deltaText !== undefined) {
-                                        httpMethod = 'POST';
-                                }
-                        }
-                }
-                
-                var self = this;
-                self.sendRequest(editorContext, {
-                        type: httpMethod,
-                        data: serverData,
-                        
-                        success: function(result) {
-                                if (result.conflict) {
-                                        // The server has lost its session state and the resource is loaded from the server
-                                        if (self._increaseRecursionCount(editorContext)) {
-                                                if (onComplete) {
-                                                        delete knownServerState.updateInProgress;
-                                                        delete knownServerState.text;
-                                                        delete knownServerState.stateId;
-                                                        self._updateService.addCompletionCallback(function() {
-                                                                self.invoke(editorContext, params, deferred);
-                                                        });
-                                                        self._updateService.invoke(editorContext, params);
-                                                } else {
-                                                        var paramsCopy = {};
-                                                        for (var p in params) {
-                                                                if (params.hasOwnProperty(p))
-                                                                        paramsCopy[p] = params[p];
-                                                        }
-                                                        paramsCopy.sendFullText = true;
-                                                        self.invoke(editorContext, paramsCopy, deferred);
-                                                }
-                                        } else {
-                                                deferred.reject(result.conflict);
-                                        }
-                                        return false;
-                                }
-                                if (onComplete && result.stateId !== undefined && result.stateId != editorContext.getServerState().stateId) {
-                                        var listeners = editorContext.updateServerState(currentText, result.stateId);
-                                        for (var i = 0; i < listeners.length; i++) {
-                                                self._updateService.addCompletionCallback(listeners[i], params);
-                                        }
-                                }
-                                deferred.resolve(result.entries);
-                        },
-                        
-                        error: function(xhr, textStatus, errorThrown) {
-                                if (onComplete && xhr.status == 404 && !params.loadFromServer && knownServerState.text !== undefined) {
-                                        // The server has lost its session state and the resource is not loaded from the server
-                                        delete knownServerState.updateInProgress;
-                                        delete knownServerState.text;
-                                        delete knownServerState.stateId;
-                                        self._updateService.addCompletionCallback(function() {
-                                                self.invoke(editorContext, params, deferred);
-                                        });
-                                        self._updateService.invoke(editorContext, params);
-                                        return true;
-                                }
-                                deferred.reject(errorThrown);
-                        },
-                        
-                        complete: onComplete
-                }, !params.sendFullText);
-                var result = deferred.promise();
-                if (onComplete) {
-                        result.always(function() {
-                                knownServerState.updateInProgress = false;
-                        });
-                }
-                return result;
-        };
-        return ContentAssistService;
-});

diff --git a/language-web/src/main/js/xtext/services/ContentAssistService.js b/language-web/src/main/js/xtext/services/ContentAssistService.js deleted file mode 100644 index 1686570d..00000000 --- a/language-web/src/main/js/xtext/services/ContentAssistService.js +++ /dev/null
@@ -1,132 +0,0 @@
1	/*******************************************************************************
2	* Copyright (c) 2015 itemis AG (http://www.itemis.eu) and others.
3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License 2.0 which is available at
5	* http://www.eclipse.org/legal/epl-2.0.
6	*
7	* SPDX-License-Identifier: EPL-2.0
8	*******************************************************************************/
9
10	define(['xtext/services/XtextService', 'jquery'], function(XtextService, jQuery) {
11
12	/**
13	* Service class for content assist proposals. The proposals are returned as promise of
14	* a Deferred object.
15	*/
16	function ContentAssistService(serviceUrl, resourceId, updateService) {
17	this.initialize(serviceUrl, 'assist', resourceId, updateService);
18	}
19
20	ContentAssistService.prototype = new XtextService();
21
22	ContentAssistService.prototype.invoke = function(editorContext, params, deferred) {
23	if (deferred === undefined) {
24	deferred = jQuery.Deferred();
25	}
26	var serverData = {
27	contentType: params.contentType
28	};
29	if (params.offset)
30	serverData.caretOffset = params.offset;
31	else
32	serverData.caretOffset = editorContext.getCaretOffset();
33	var selection = params.selection ? params.selection : editorContext.getSelection();
34	if (selection.start != serverData.caretOffset \|\| selection.end != serverData.caretOffset) {
35	serverData.selectionStart = selection.start;
36	serverData.selectionEnd = selection.end;
37	}
38	var currentText;
39	var httpMethod = 'GET';
40	var onComplete = undefined;
41	var knownServerState = editorContext.getServerState();
42	if (params.sendFullText) {
43	serverData.fullText = editorContext.getText();
44	httpMethod = 'POST';
45	} else {
46	serverData.requiredStateId = knownServerState.stateId;
47	if (this._updateService) {
48	if (knownServerState.text === undefined \|\| knownServerState.updateInProgress) {
49	var self = this;
50	this._updateService.addCompletionCallback(function() {
51	self.invoke(editorContext, params, deferred);
52	});
53	return deferred.promise();
54	}
55	knownServerState.updateInProgress = true;
56	onComplete = this._updateService.onComplete.bind(this._updateService);
57	currentText = editorContext.getText();
58	this._updateService.computeDelta(knownServerState.text, currentText, serverData);
59	if (serverData.deltaText !== undefined) {
60	httpMethod = 'POST';
61	}
62	}
63	}
64
65	var self = this;
66	self.sendRequest(editorContext, {
67	type: httpMethod,
68	data: serverData,
69
70	success: function(result) {
71	if (result.conflict) {
72	// The server has lost its session state and the resource is loaded from the server
73	if (self._increaseRecursionCount(editorContext)) {
74	if (onComplete) {
75	delete knownServerState.updateInProgress;
76	delete knownServerState.text;
77	delete knownServerState.stateId;
78	self._updateService.addCompletionCallback(function() {
79	self.invoke(editorContext, params, deferred);
80	});
81	self._updateService.invoke(editorContext, params);
82	} else {
83	var paramsCopy = {};
84	for (var p in params) {
85	if (params.hasOwnProperty(p))
86	paramsCopy[p] = params[p];
87	}
88	paramsCopy.sendFullText = true;
89	self.invoke(editorContext, paramsCopy, deferred);
90	}
91	} else {
92	deferred.reject(result.conflict);
93	}
94	return false;
95	}
96	if (onComplete && result.stateId !== undefined && result.stateId != editorContext.getServerState().stateId) {
97	var listeners = editorContext.updateServerState(currentText, result.stateId);
98	for (var i = 0; i < listeners.length; i++) {
99	self._updateService.addCompletionCallback(listeners[i], params);
100	}
101	}
102	deferred.resolve(result.entries);
103	},
104
105	error: function(xhr, textStatus, errorThrown) {
106	if (onComplete && xhr.status == 404 && !params.loadFromServer && knownServerState.text !== undefined) {
107	// The server has lost its session state and the resource is not loaded from the server
108	delete knownServerState.updateInProgress;
109	delete knownServerState.text;
110	delete knownServerState.stateId;
111	self._updateService.addCompletionCallback(function() {
112	self.invoke(editorContext, params, deferred);
113	});
114	self._updateService.invoke(editorContext, params);
115	return true;
116	}
117	deferred.reject(errorThrown);
118	},
119
120	complete: onComplete
121	}, !params.sendFullText);
122	var result = deferred.promise();
123	if (onComplete) {
124	result.always(function() {
125	knownServerState.updateInProgress = false;
126	});
127	}
128	return result;
129	};
130
131	return ContentAssistService;
132	});