From b7ac540f150e74ec7577df08511f977a67cd40e1 Mon Sep 17 00:00:00 2001
From: Igor Aleksanov <popzxc@yandex.ru>
Date: Fri, 2 Oct 2020 13:23:49 +0300
Subject: Use ast::String for extracting string literal contents

---
 crates/ide/src/completion/complete_postfix.rs      |  8 +++++--
 .../src/completion/complete_postfix/format_like.rs | 25 +++++++++++-----------
 2 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'crates/ide')

diff --git a/crates/ide/src/completion/complete_postfix.rs b/crates/ide/src/completion/complete_postfix.rs
index e549e0517..db5319618 100644
--- a/crates/ide/src/completion/complete_postfix.rs
+++ b/crates/ide/src/completion/complete_postfix.rs
@@ -4,7 +4,7 @@ mod format_like;
 
 use assists::utils::TryEnum;
 use syntax::{
-    ast::{self, AstNode},
+    ast::{self, AstNode, AstToken},
     TextRange, TextSize,
 };
 use text_edit::TextEdit;
@@ -212,7 +212,11 @@ pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
     )
     .add_to(acc);
 
-    add_format_like_completions(acc, ctx, &dot_receiver, cap, &receiver_text);
+    if let ast::Expr::Literal(literal) = dot_receiver.clone() {
+        if let Some(literal_text) = ast::String::cast(literal.token()) {
+            add_format_like_completions(acc, ctx, &dot_receiver, cap, &literal_text);
+        }
+    }
 }
 
 fn get_receiver_text(receiver: &ast::Expr, receiver_is_ambiguous_float_literal: bool) -> String {
diff --git a/crates/ide/src/completion/complete_postfix/format_like.rs b/crates/ide/src/completion/complete_postfix/format_like.rs
index f0ef017d1..53cb3af39 100644
--- a/crates/ide/src/completion/complete_postfix/format_like.rs
+++ b/crates/ide/src/completion/complete_postfix/format_like.rs
@@ -18,23 +18,22 @@ use crate::completion::{
     complete_postfix::postfix_snippet, completion_config::SnippetCap,
     completion_context::CompletionContext, completion_item::Completions,
 };
-use syntax::ast;
+use syntax::ast::{self, AstToken};
 
 pub(super) fn add_format_like_completions(
     acc: &mut Completions,
     ctx: &CompletionContext,
     dot_receiver: &ast::Expr,
     cap: SnippetCap,
-    receiver_text: &str,
+    receiver_text: &ast::String,
 ) {
-    if !is_string_literal(receiver_text) {
+    let input = match string_literal_contents(receiver_text) {
         // It's not a string literal, do not parse input.
-        return;
-    }
-
-    let input = &receiver_text[1..receiver_text.len() - 1];
+        Some(input) => input,
+        None => return,
+    };
 
-    let mut parser = FormatStrParser::new(input.to_owned());
+    let mut parser = FormatStrParser::new(input);
 
     if parser.parse().is_ok() {
         for kind in PostfixKind::all_suggestions() {
@@ -47,11 +46,13 @@ pub(super) fn add_format_like_completions(
 }
 
 /// Checks whether provided item is a string literal.
-fn is_string_literal(item: &str) -> bool {
-    if item.len() < 2 {
-        return false;
+fn string_literal_contents(item: &ast::String) -> Option<String> {
+    let item = item.text();
+    if item.len() >= 2 && item.starts_with("\"") && item.ends_with("\"") {
+        return Some(item[1..item.len() - 1].to_owned());
     }
-    item.starts_with("\"") && item.ends_with("\"")
+
+    None
 }
 
 /// Parser for a format-like string. It is more allowing in terms of string contents,
-- 
cgit v1.2.3