equal
deleted
inserted
replaced
142 JEdit_Lib.try_get_text(buffer, JEdit_Lib.point_range(buffer, caret))) |
142 JEdit_Lib.try_get_text(buffer, JEdit_Lib.point_range(buffer, caret))) |
143 |
143 |
144 val context = |
144 val context = |
145 (opt_rendering orElse PIDE.document_view(text_area).map(_.get_rendering()) match { |
145 (opt_rendering orElse PIDE.document_view(text_area).map(_.get_rendering()) match { |
146 case Some(rendering) => |
146 case Some(rendering) => |
147 rendering.completion_context(JEdit_Lib.stretch_point_range(buffer, caret)) |
147 rendering.language_context(JEdit_Lib.stretch_point_range(buffer, caret)) |
148 case None => None |
148 case None => None |
149 }) getOrElse syntax.completion_context |
149 }) getOrElse syntax.language_context |
150 |
150 |
151 syntax.completion.complete(history, decode, explicit, start, text, word_context, context) |
151 syntax.completion.complete(history, decode, explicit, start, text, word_context, context) |
152 |
152 |
153 case None => None |
153 case None => None |
154 } |
154 } |
390 |
390 |
391 val word_context = |
391 val word_context = |
392 Completion.word_context(JEdit_Lib.try_get_text(text_field.getText, |
392 Completion.word_context(JEdit_Lib.try_get_text(text_field.getText, |
393 Text.Range(caret, caret + 1))) // FIXME proper point range!? |
393 Text.Range(caret, caret + 1))) // FIXME proper point range!? |
394 |
394 |
395 val context = syntax.completion_context |
395 val context = syntax.language_context |
396 |
396 |
397 syntax.completion.complete(history, true, false, 0, text, word_context, context) match { |
397 syntax.completion.complete(history, true, false, 0, text, word_context, context) match { |
398 case Some(result) => |
398 case Some(result) => |
399 val fm = text_field.getFontMetrics(text_field.getFont) |
399 val fm = text_field.getFontMetrics(text_field.getFont) |
400 val loc = |
400 val loc = |