rename Context to LineContext, more simplifications

src/vs/editor/contrib/suggest/common/suggestModel.ts

@@ -30,7 +30,7 @@ export interface ISuggestEvent {
 	auto: boolean;
 }
 
-export class Context {
+export class LineContext {
 
 	static shouldAutoTrigger(editor: ICommonCodeEditor): boolean {
 		const model = editor.getModel();
@@ -65,26 +65,17 @@ export class Context {
 
 	readonly lineNumber: number;
 	readonly column: number;
-
 	readonly lineContentBefore: string;
 	readonly wordBefore: string;
 
 	constructor(model: IModel, position: IPosition, private auto: boolean) {
-		const lineContent = model.getLineContent(position.lineNumber);
-		const wordUnderCursor = model.getWordAtPosition(position);
-
-		if (wordUnderCursor) {
-			this.wordBefore = lineContent.substring(wordUnderCursor.startColumn - 1, position.column - 1);
-		} else {
-			this.wordBefore = '';
-		}
-
+		this.lineContentBefore = model.getLineContent(position.lineNumber).substr(0, position.column - 1);
+		this.wordBefore = model.getWordUntilPosition(position).word;
 		this.lineNumber = position.lineNumber;
 		this.column = position.column;
-		this.lineContentBefore = lineContent.substr(0, position.column - 1);
 	}
 
-	isDifferentContext(context: Context): boolean {
+	isDifferentContext(context: LineContext): boolean {
 		if (this.lineNumber !== context.lineNumber) {
 			// Line number has changed
 			return true;
@@ -108,7 +99,7 @@ export class Context {
 		return false;
 	}
 
-	shouldRetrigger(context: Context): boolean {
+	shouldRetrigger(context: LineContext): boolean {
 		if (!startsWith(this.lineContentBefore, context.lineContentBefore)) {
 			// Doesn't look like the same line
 			return false;
@@ -144,7 +135,7 @@ export class SuggestModel implements IDisposable {
 	private state: State;
 
 	private requestPromise: TPromise<void>;
-	private context: Context;
+	private context: LineContext;
 
 	private completionModel: CompletionModel;
 
@@ -294,7 +285,7 @@ export class SuggestModel implements IDisposable {
 			if (this.editor.getConfiguration().contribInfo.quickSuggestions) {
 				// trigger suggest from idle when configured to do so
 				this.cancel();
-				if (Context.shouldAutoTrigger(this.editor)) {
+				if (LineContext.shouldAutoTrigger(this.editor)) {
 					this.triggerAutoSuggestPromise = TPromise.timeout(this.quickSuggestDelay);
 					this.triggerAutoSuggestPromise.then(() => {
 						this.triggerAutoSuggestPromise = null;
@@ -305,7 +296,7 @@ export class SuggestModel implements IDisposable {
 
 		} else {
 			// refine active suggestion
-			const ctx = new Context(model, this.editor.getPosition(), false);
+			const ctx = new LineContext(model, this.editor.getPosition(), false);
 			this.onNewContext(ctx);
 		}
 	}
@@ -318,9 +309,9 @@ export class SuggestModel implements IDisposable {
 			return;
 		}
 
-		const ctx = new Context(model, this.editor.getPosition(), auto);
+		const ctx = new LineContext(model, this.editor.getPosition(), auto);
 
-		if (!Context.isInEditableRange(this.editor)) {
+		if (!LineContext.isInEditableRange(this.editor)) {
 			return;
 		}
 
@@ -351,7 +342,7 @@ export class SuggestModel implements IDisposable {
 				items = items.concat(existingItems).sort(cmpFn);
 			}
 
-			const ctx = new Context(model, this.editor.getPosition(), auto);
+			const ctx = new LineContext(model, this.editor.getPosition(), auto);
 			this.completionModel = new CompletionModel(items, this.context.column, {
 				leadingLineContent: ctx.lineContentBefore,
 				characterCountDelta: this.context ? ctx.column - this.context.column : 0
@@ -361,7 +352,7 @@ export class SuggestModel implements IDisposable {
 		}).then(null, onUnexpectedError);
 	}
 
-	private onNewContext(ctx: Context): void {
+	private onNewContext(ctx: LineContext): void {
 		if (this.context && this.context.isDifferentContext(ctx)) {
 			if (this.context.shouldRetrigger(ctx)) {
 				this.trigger(this.state === State.Auto, true);

src/vs/editor/contrib/suggest/test/common/suggestModel.test.ts

@@ -12,7 +12,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { Model } from 'vs/editor/common/model/model';
 import { ICommonCodeEditor, Handler } from 'vs/editor/common/editorCommon';
 import { ISuggestSupport, ISuggestResult, SuggestRegistry } from 'vs/editor/common/modes';
-import { SuggestModel, Context } from 'vs/editor/contrib/suggest/common/suggestModel';
+import { SuggestModel, LineContext } from 'vs/editor/contrib/suggest/common/suggestModel';
 import { MockCodeEditor, MockScopeLocation } from 'vs/editor/test/common/mocks/mockCodeEditor';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
@@ -51,7 +51,7 @@ suite('SuggestModel - Context', function () {
 			const pos = model.getPositionAt(offset);
 			const editor = createMockEditor(model);
 			editor.setPosition(pos);
-			assert.equal(Context.shouldAutoTrigger(editor), expected);
+			assert.equal(LineContext.shouldAutoTrigger(editor), expected);
 			editor.dispose();
 		}
 
@@ -64,13 +64,13 @@ suite('SuggestModel - Context', function () {
 	test('Context - isDifferentContext', function () {
 
 		// different line
-		const ctx = new Context(model, { lineNumber: 1, column: 8 }, true); // Das Pfer|d
-		assert.equal(ctx.isDifferentContext(new Context(model, { lineNumber: 2, column: 1 }, true)), true);
+		const ctx = new LineContext(model, { lineNumber: 1, column: 8 }, true); // Das Pfer|d
+		assert.equal(ctx.isDifferentContext(new LineContext(model, { lineNumber: 2, column: 1 }, true)), true);
 
 
 		function createEndContext(value: string) {
 			const model = Model.createFromString(value);
-			const ctx = new Context(model, model.getPositionAt(value.length), true); // Das Pfer|d
+			const ctx = new LineContext(model, model.getPositionAt(value.length), true); // Das Pfer|d
 			return ctx;
 		}