Attachment 261056 Details for Bug 473787 – Proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed patch

changes (2).patch (text/plain), 12.53 KB, created by Olivier Thomann

on 2016-04-18 18:32:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2016-04-18 18:32:53 EDT

Size: 12.53 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
>index 07fbabb..7aed82b 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
>@@ -348,30 +348,66 @@ define("orion/editor/contentAssist", [ //$NON-NLS-0$
> 			var indentation = line.substring(0, index);
> 			var options = textView.getOptions("tabSize", "expandTab"); //$NON-NLS-1$ //$NON-NLS-0$
> 			var tab = options.expandTab ? new Array(options.tabSize + 1).join(" ") : "\t"; //$NON-NLS-1$ //$NON-NLS-0$
>-			var params = {
>-				line: line,
>-				offset: mapOffset,
>-				prefix: model.getText(this.getPrefixStart(model, mapOffset), mapOffset),
>-				selection: sel,
>-				delimiter: model.getLineDelimiter(),
>-				tab: tab,
>-				indentation: indentation
>-			};
>-			var self = this;
>+			var lineDelimiter = model.getLineDelimiter();
>+			var _self = this;
> 			var promises = providerInfoArray.map(function(providerInfo) {
> 				var provider = providerInfo.provider;
>+				var computePrefixFunc = provider.computePrefix;
>+				var ecProvider = _self.editorContextProvider, editorContext = ecProvider.getEditorContext();
>+				if (computePrefixFunc) {
>+					var result = computePrefixFunc.apply(provider, [editorContext, mapOffset]);
>+					return result.then(function(prefix) {
>+						var params = {
>+							line: line,
>+							offset: mapOffset,
>+							prefix: prefix,
>+							selection: sel,
>+							delimiter: lineDelimiter,
>+							tab: tab,
>+							indentation: indentation
>+						};
>+						var proposals;
>+						try {
>+							var func, promise;
>+							if ((func = provider.computeContentAssist)) {
>+								params = objects.mixin(params, ecProvider.getOptions());
>+								promise = func.apply(provider, [editorContext, params]);
>+							} else if ((func = provider.getProposals || provider.computeProposals)) {
>+								// old API
>+								promise = func.apply(provider, [model.getText(), mapOffset, params]);
>+							}
>+							proposals = _self.progress ? _self.progress.progress(promise, "Generating content assist proposal") : promise; //$NON-NLS-0$
>+						} catch (e) {
>+							return new Deferred().reject(e);
>+						}
>+						return Deferred.when(proposals);
>+					},
>+					function(err) {
>+						return new Deferred().reject(err);
>+					});
>+				}
>+				// no computePrefix function is defined for the provider. Use the default prefix
>+				var params = {
>+					line: line,
>+					offset: mapOffset,
>+					prefix: model.getText(_self.getPrefixStart(model, mapOffset), mapOffset),
>+					selection: sel,
>+					delimiter: lineDelimiter,
>+					tab: tab,
>+					indentation: indentation
>+				};
> 				var proposals;
> 				try {
> 					var func, promise;
> 					if ((func = provider.computeContentAssist)) {
>-						var ecProvider = self.editorContextProvider, editorContext = ecProvider.getEditorContext();
>+						var ecProvider = _self.editorContextProvider, editorContext = ecProvider.getEditorContext();
> 						params = objects.mixin(params, ecProvider.getOptions());
> 						promise = func.apply(provider, [editorContext, params]);
> 					} else if ((func = provider.getProposals || provider.computeProposals)) {
> 						// old API
> 						promise = func.apply(provider, [model.getText(), mapOffset, params]);
> 					}
>-					proposals = self.progress ? self.progress.progress(promise, "Generating content assist proposal") : promise; //$NON-NLS-0$
>+					proposals = _self.progress ? _self.progress.progress(promise, "Generating content assist proposal") : promise; //$NON-NLS-0$
> 				} catch (e) {
> 					return new Deferred().reject(e);
> 				}
>@@ -383,7 +419,7 @@ define("orion/editor/contentAssist", [ //$NON-NLS-0$
> 			
> 			if (this.pageMessage){
> 				allPromises = Deferred.when(allPromises, function(proposals){
>-					self.pageMessage.close();					
>+					_self.pageMessage.close();
> 					var foundProposal = false;
> 					if (proposals && proposals.length > 0){
> 						for (var i=0; i<proposals.length; i++) {
>@@ -394,13 +430,12 @@ define("orion/editor/contentAssist", [ //$NON-NLS-0$
> 						}
> 					}
> 					if (!foundProposal){
>-						self.pageMessage.setErrorMessage(messages["noProposals"]);
>+						_self.pageMessage.setErrorMessage(messages["noProposals"]);
> 					}
> 					return proposals;
> 				});
>-				self.pageMessage.showWhile(allPromises, messages["computingProposals"]);
>+				this.pageMessage.showWhile(allPromises, messages["computingProposals"]);
> 			}
>-			
> 			return allPromises;
> 		},
> 
>@@ -441,26 +476,25 @@ define("orion/editor/contentAssist", [ //$NON-NLS-0$
> 									return false; // unknown format
> 								}
> 			
>-								return (0 === proposalString.indexOf(prefixText + this._filterText));
>+								return 0 === proposalString.indexOf(prefixText + this._filterText);
> 								
> 							} else if (proposal.name || proposal.proposal) {
> 								var activated = false;
> 								// try matching name
> 								if (proposal.name) {
>-									activated = (0 === proposal.name.indexOf(prefixText + this._filterText));	
>+									activated = 0 === proposal.name.indexOf(prefixText + this._filterText);	
> 								}
> 								
> 								// try matching proposal text
> 								if (!activated && proposal.proposal) {
>-									activated = (0 === proposal.proposal.indexOf(this._filterText));
>+									activated = 0 === proposal.proposal.indexOf(this._filterText);
> 								}
> 								
> 								return activated;
> 							} else if (typeof proposal === "string") { //$NON-NLS-0$
> 								return 0 === proposal.indexOf(this._filterText);
>-							} else {
>-								return false;
> 							}
>+							return false;
> 						}, this);
> 						
> 						if (includedProposals.length > 0) {
>diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/contentAssist/ternAssist.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/contentAssist/ternAssist.js
>index 6702032..f913b0e 100644
>--- a/bundles/org.eclipse.orion.client.javascript/web/javascript/contentAssist/ternAssist.js
>+++ b/bundles/org.eclipse.orion.client.javascript/web/javascript/contentAssist/ternAssist.js
>@@ -184,6 +184,30 @@ define([
> 	Objects.mixin(TernContentAssist.prototype, {
> 
> 		/**
>+		 * @private
>+		 */
>+		_getPrefixStart: function(text, offset) {
>+			var index = offset;
>+			while (index > 0) {
>+				var char = text.substring(index - 1, index);
>+				if (/[A-Za-z0-9_]/.test(char)) {
>+					index--;
>+				} else {
>+					break;
>+				}
>+			}
>+			return index;
>+		},
>+		/**
>+		 * @callback 
>+		 */
>+		computePrefix(editorContext, offset) {
>+			var that = this;
>+			return editorContext.getText().then(function (text) {
>+				return text.substring(that._getPrefixStart(text, offset), offset);
>+			});
>+		},
>+		/**
> 		 * Called by the framework to initialize this provider before any <tt>computeContentAssist</tt> calls.
> 		 */
> 		initialize: function() {
>diff --git a/bundles/org.eclipse.orion.client.webtools/web/js-tests/webtools/htmlContentAssistTests.js b/bundles/org.eclipse.orion.client.webtools/web/js-tests/webtools/htmlContentAssistTests.js
>index 2591b60..803083c 100644
>--- a/bundles/org.eclipse.orion.client.webtools/web/js-tests/webtools/htmlContentAssistTests.js
>+++ b/bundles/org.eclipse.orion.client.webtools/web/js-tests/webtools/htmlContentAssistTests.js
>@@ -1788,69 +1788,6 @@ define([
>     			assert(knownProp, "Could not find expected proposal role");
>     		});
>     	});
>-    	it('Tags that support the attributes of many roles: details (13). Empty prefix. <details aria->', function() {
>-    		var _o = setup({buffer: '<html><body><details aria-></details></body></html>'});
>-    		return assist.computeContentAssist(_o.editorContext, {offset: 26, prefix: ''}).then(function(proposals) {
>-    			var expectedCount = 17 + 13; // "ARIA title" + 16 aria-* globals + 13 role-specific aria-* attributes
>-    			assert(proposals.length === expectedCount, "Incorrect number of proposals for details tag attributes. Proposal count: " + proposals.length + " Expected count: " + expectedCount);
>-    			var knownProp;
>-    			for (var i=0; i<proposals.length; i++) {
>-    				if (proposals[i].name === "aria-checked"){
>-    					knownProp = proposals[i];
>-    				}
>-    			}
>-    			assert(knownProp, "Could not find expected proposal aria-checked");
>-    			knownProp = null;
>-    			for (i=0; i<proposals.length; i++) {
>-    				if (proposals[i].name === "aria-expanded"){
>-    					knownProp = proposals[i];
>-    				}
>-    			}
>-    			assert(knownProp, "Could not find expected proposal aria-expanded");
>-    			knownProp = null;
>-    			for (i=0; i<proposals.length; i++) {
>-    				if (proposals[i].name === "aria-activedescendant"){
>-    					knownProp = proposals[i];
>-    				}
>-    			}
>-    			assert(knownProp, "Could not find expected proposal aria-activedescendant");
>-    			knownProp = null;
>-    			for (i=0; i<proposals.length; i++) {
>-    				if (proposals[i].name === "aria-multiselectable"){
>-    					knownProp = proposals[i];
>-    				}
>-    			}
>-    			assert(knownProp, "Could not find expected proposal aria-multiselectable");
>-    			knownProp = null;
>-    			for (i=0; i<proposals.length; i++) {
>-    				if (proposals[i].name === "aria-pressed"){
>-    					knownProp = proposals[i];
>-    				}
>-    			}
>-    			assert(knownProp, "Could not find expected proposal aria-pressed");
>-    			knownProp = null;
>-    			for (i=0; i<proposals.length; i++) {
>-    				if (proposals[i].name === "aria-required"){
>-    					knownProp = proposals[i];
>-    				}
>-    			}
>-    			assert(knownProp, "Could not find expected proposal aria-required");
>-    			knownProp = null;
>-    			for (i=0; i<proposals.length; i++) {
>-    				if (proposals[i].name === "aria-posinset"){
>-    					knownProp = proposals[i];
>-    				}
>-    			}
>-    			assert(knownProp, "Could not find expected proposal aria-posinset");
>-    			knownProp = null;
>-    			for (i=0; i<proposals.length; i++) {
>-    				if (proposals[i].name === "aria-setsize"){
>-    					knownProp = proposals[i];
>-    				}
>-    			}
>-    			assert(knownProp, "Could not find expected proposal aria-setsize");
>-    		});
>-    	});
>     	it('Tags that support the attributes of many roles: details (13). Prefix ar. <details ar>', function() {
>     		var _o = setup({buffer: '<html><body><details ar></details></body></html>'});
>     		return assist.computeContentAssist(_o.editorContext, {offset: 21, prefix: 'ar'}).then(function(proposals) {
>diff --git a/bundles/org.eclipse.orion.client.webtools/web/webtools/htmlContentAssist.js b/bundles/org.eclipse.orion.client.webtools/web/webtools/htmlContentAssist.js
>index c4d111d..bf63e43 100644
>--- a/bundles/org.eclipse.orion.client.webtools/web/webtools/htmlContentAssist.js
>+++ b/bundles/org.eclipse.orion.client.webtools/web/webtools/htmlContentAssist.js
>@@ -153,6 +153,30 @@ define([
> 	
> 	Objects.mixin(HTMLContentAssistProvider.prototype, {
> 		/**
>+		 * @private
>+		 */
>+		_getPrefixStart: function(text, offset) {
>+			var index = offset;
>+			while (index > 0) {
>+				var char = text.substring(index - 1, index);
>+				if (/[A-Za-z0-9_-]/.test(char)) {
>+					index--;
>+				} else {
>+					break;
>+				}
>+			}
>+			return index;
>+		},
>+		/**
>+		 * @callback 
>+		 */
>+		computePrefix(editorContext, offset) {
>+			var that = this;
>+			return editorContext.getText().then(function (text) {
>+				return text.substring(that._getPrefixStart(text, offset), offset);
>+			});
>+		},
>+		/**
> 		 * @callback 
> 		 */
> 		computeContentAssist: function(editorContext, params) {
>@@ -468,23 +492,7 @@ define([
> 			var index = params.offset - prefix.length - 1;
> 			if (index > 0 && index < source.length) {
> 				var precedingChar = source.charAt(index);
>-				if (precedingChar === '-') {
>-					index--;
>-					if (index !== 0) {
>-						// rebuild a prefix based on what characters (letter only) are before the '-'
>-						precedingChar = source.charAt(index);
>-						var currentPrefix = "-" + prefix;
>-						loop: while (index > 0 && /[A-Za-z0-9_-]/.test(precedingChar)) {
>-							index--;
>-							currentPrefix = precedingChar + currentPrefix;
>-							if (index === 0) {
>-								break loop;
>-							}
>-							precedingChar = source.charAt(index);
>-						}
>-						params.prefix = currentPrefix;
>-					}
>-				} else if (precedingChar === '=' && prefix.length === 0 && (index - 1) > 0) {
>+				if (precedingChar === '=' && prefix.length === 0 && (index - 1) > 0) {
> 					precedingChar = source.charAt(index - 1);
> 					if (/[A-Za-z0-9_]/.test(precedingChar)) {
> 						proposals.push(this.makeComputedProposal("\"\"",  Messages['addQuotesToAttributes'], " - \"\"", null, prefix)); //$NON-NLS-1$ //$NON-NLS-2$

Actions: View | Diff

Attachments on bug 473787: 260960 | 261052 | 261056