From a9b19fa463cc3ceae7ebbf08172084fe3c7aaca1 Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Tue, 25 Jan 2022 20:31:54 +0530
Subject: [PATCH] New feature: Expand selection Expand the current selection in
 editor using the 'Expand selection' option

---
 .idea/misc.xml                                |   1 +
 .../main/assets/data/common/gradle-plugin.zip | Bin 37242 -> 37238 bytes
 .../rosemoe/editor/widget/CodeEditor.java     |  42 ++++++
 .../widget/EditorTextActionModeStarter.java   | 100 +++-----------
 .../main/res/drawable/ic_expand_selection.xml |   8 ++
 app/src/main/res/values/strings.xml           |   5 +-
 .../com/itsaky/lsp/api/ILanguageServer.java   |   8 ++
 .../itsaky/lsp/api/ISelectionProvider.java    |  44 ++++++
 .../com/itsaky/lsp/api/IServerSettings.java   |   8 ++
 .../java/com/itsaky/lsp/models/Locations.kt   |  39 +++++-
 .../itsaky/lsp/util/DefaultServerSettings.kt  |   1 +
 .../itsaky/lsp/util/NoSelectionProvider.kt    |  29 ++++
 .../itsaky/lsp/java/JavaLanguageServer.java   |  13 ++
 .../java/providers/JavaSelectionProvider.java |  67 +++++++++
 .../lsp/java/visitors/FindBiggerRange.java    | 127 ++++++++++++++++++
 .../itsaky/lsp/java/visitors/FindNameAt.java  |   1 +
 16 files changed, 406 insertions(+), 87 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_expand_selection.xml
 create mode 100644 lsp/api/src/main/java/com/itsaky/lsp/api/ISelectionProvider.java
 create mode 100644 lsp/api/src/main/java/com/itsaky/lsp/util/NoSelectionProvider.kt
 create mode 100644 lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java
 create mode 100644 lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6d6a2581e..28e84c20f 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Projects/AndroidStudioProjects/AndroidIDE/app/src/main/res/drawable-hdpi/ic_expand_selection.xml" value="0.20833333333333334" />
         <entry key="..\:/Projects/AndroidStudioProjects/AndroidIDE/app/src/main/res/drawable/bg_design_container_background.xml" value="0.1" />
         <entry key="..\:/Projects/AndroidStudioProjects/AndroidIDE/app/src/main/res/drawable/bg_ui_view_pressed.xml" value="0.1" />
         <entry key="..\:/Projects/AndroidStudioProjects/AndroidIDE/app/src/main/res/drawable/ic_github.xml" value="0.21837606837606838" />
diff --git a/app/src/main/assets/data/common/gradle-plugin.zip b/app/src/main/assets/data/common/gradle-plugin.zip
index 22ba8b4559eb0572267b516ec4a637222f722450..e8c67c7f6a7de4d3773e3b3e14aba1f9a334716a 100644
GIT binary patch
delta 1599
zcmeyhi0RuRrVXBqOcxhz_GVlMq9^}mS_`69F>eJ?i7ZDzlsfBE!HbJ5LmnjlcyO43
zfuVwtfx%~T0f+zO95(*?S8Q^x_Hf?&%6Lf1ePgzJwCnwQR#9fG`9DAZ_q0>uJMSpY
zUlJF&Szr6mDJI|arAB}E?U~a*JGL_8y0&2g11DortjMDBZ+7!iZr^NN@!;V%rGzD$
zy|g-;(yC82alhh<{UNTtmwDyHo?rL0m0u{?pH<(%Ve<0EMS%<LW`~5-GTehs7OxPr
zNi#nEWLd1;%bk-yM=rDZE7`HUc1O=gL5=8h7U`n-t9CuS{fpVCTG;ZhlX%I;!{!0r
z%q(0C3>+K`Admft?X#Wi$R2Cs;bY>z#l*mDn}L_9k++Yr=Vl*oQ*STNO<PQiOpQI*
z7*O?9oK(D^1`H4lAPxiuNU)tD>p@ON1_ci0173f;WYk{AAKdL;{x&A_+#)jvPd_cb
zv&!p34{*z)8gosS`GGOe2#3l1oZ%iure>@M8-a$fupF5BMA^RY#6RVd>vl0!4%^?}
zS>L@vDE!r|-<NWD%!4LK>GQk|f3ra}!M7IG#2+?43?_4NCWdTeWKiT_*)a9P0p{b5
z6aKpYSbr&X>gRWRo)k&lTsC0=N4`z;DWlJPd*iAXRID(4Gr5mp!W+-ZwU^D@L)o^!
zeiMIVmTrOfs%oV#ncS9zNnG{1XTCE|keYmxvksUrHb-)0rh^j5k-}yW<yq7LqAnLr
z2T?i2yMWYYjgm?x5O;A|8;H^_?*UOe%V&eAu!_AvYO`qNUvTOZsRo-fvl?uUa?MPT
znte5Ugg}v`d`Ct105Fu2fT_=nVRGOEi~86Jj(p7u0<PbEtJojM1+MZGU$I;5?saCL
zlq?THo`lQy_FZw<a`$6}{4?g)ag%-KWvscd%JcLd58;sJXHLDox9;oRw0wK(aii~x
zhGypdenMtad(VX5<EuK=y7@!J^94IDHgWg$xa>_kXi?aHuu_h<p!25A^gs=_vNYc|
zsk$$*r|R6BoL@)9YwJsJip+8BOfWpvaj<Q7&VyX_XUc6hKdm3QM_)hx@8pT-sDP*`
zTl7}Xnzt%{;@P!lPx_a-mF@q^h#G6#tyzC60ez?d#8x05T3Y0$n0g!gdzo(b@i8(r
zFg7*Yw8g{Qd!vD`k%@<qp{a+d`6d>$L^(ru%QLmfg7t1rh_u*b6D^baZT*A0fez;;
zK3bac@?^J}kXF&^i=mtCP~EW9t>ZK}Edt$O3vz=EBtfzR6C@9_fp^JWM#~M4<C#t_
z>R>y1M&0z_o@S2noU`mb@(ca%-x8~3xw!1>j#(N(_Nc}-9yoPmvSNd02=7UEMrKDI
z76Y$$&l@-A{ZUl;rB!oj(Zj_F;q$e(t(kIW<*P)eRx90oqV-m5lNKy5ywP%G=H#3O
z+b!Mg>eui77aG&0cH!fjD;yt{d?J)*`s<&*UO)LmgUsez4W-~T6xak#HE){cf)Y=6
z^E?ox-Le2goo!jb0V~KRm$nvxIpECyzO{@KBm>UTlk?ij6hJ(9#smgNFc8DQlEx5@
z$%P!DlOx-Cz-EB*+vePMWv~k-b>xC9W9%#hQ6-&4AnHYD35bg80#jGI3P3!!ZZL08
zcPWTx+*1ys)<7uLUa%=sdcmf!_km5R?gMN1*jEC!7L+9>=k~{dIiS=t`C@+p*dLHY
zU^O8D><`pPh53SkVM$|cJt&GNhqd#A6@sEE1SsDC#I^`^K!w~5V1<bjh1qt2WElWZ
CM3!m*

delta 1593
zcmeyii0RiNrVXBqOqL~^y&2bm=*hpC)`F;2%v(WJBFhmFrOx_P$g;#T<b$31wZjYy
z3>AzF3_c8#8{7OQ=dkhDt2H@ozsvIe9pfP>_l?=^w>$UkE!~pCb??*j|C4K4%+EWf
z@^A5zihatOSlPDA*y+{2Q@3ANmY<njwfiA+mB0hVE0M>lvzL8TdUcM+rHcK#IHT^G
ziB4QkOl}s7t(k8A;?I7Im%1FSDIvl7rps6Vv5|ksbYYFNd!zgF*9_hg%LCnA&o6Q+
zm~lpBv2^*)71RArsY`zTlCChPY@h65<$x=y+TLMP*vpcBJAY)1+%t1d-NNEszaB~l
zcr&wbF)(m&Fo1k!(*BxjvLkz}t+Ba*xsRcNv6qRlk+0Eq6JK8wFE2AQ!;L=MHu!Aw
zVPrtn=X#^=w>mIHG=Mk|6e7WPtOpqd85B5}4|pANh?KF7_|Ngr`i0*Sx%gwpxJA@9
zC5GFuZS+3Hk7~|7mYu;yKr<XB^K*u~8=0E19&BVh;K0IsV5-2PV}Wn>AG*Ksrt7Ic
z*J>-{lUik+uTGk^^tRH==NZjLLXQ=~-cS07=CE^1^e;~4;!F%V&UnCpgJr{1AH&o+
z%!mIetHj$L;qqxQ%6k5!$m&)b`}vd?o7}!-WyU8j=XIF(!(va*{mkrbcNZ!h^QyM^
z@<?69_W1AHP3I>r6X6bdY_!$9rS?4g1gXh4IqQHaV{;@|W;!T^94TxDQJzH|AnJ0_
zbP$zOybDNe)+niD0&y3YwSg$@@*WVivwSv)3ai))q&ACI{skvLk!r9xGpoVoDA&vc
zso7Vv2b}zjn}16m00vSLF!`AQ1H0d%K6b)Iz9t2cw)eNI*q`rh+P3YM!24Uf&a+!g
zo}8>`aUd*T-g3q@S^4|?&)Ki-bDL^=(JHfKa=7YQ<12dwgZO>#-PJp)ng6ryxZ4+n
z1I`iYlG1BtE?@m%ucY@&S(|&R8Hv3jK?=&A`jH#r?k)V@$j<GQXt=U+!mNqCk&`yM
zN$ia+xDoi^Vx?Tx)F~4^E=GoM@J;rS$lY_=HLg6!F7eFd{mhA5KHn9Y*VA-;%eu@^
z`Ij^0`mSz2@oL($C(EsrXW##Y7HbM(mLW<&A1VN`6~ko3iIx_*DW;n}3_Z=fe2jfO
z4NZN0Ow7!E4b6;={k%=L8F+abdu(DrGv)uCv_6f=g7t3JyeAF{G8nM19GG_KiNw<f
zFZQ>j%wN4W=3|QNqUA^4iI^1BIG(n5oLqyN7!BrqYc`!cq29xt_vAsw1E91#wSnPa
zp-Ad~!CSxQvDNI*D!Df!fa%2H<YTjJSA+;>W(VZQ|2X$ylKsw(>+-0E#oEL^oGjbm
z8Nzyy6O<I09lQ^m61EhP`Y%-0uDr@;#`;ip<GakO;-;F5%B;VBbML>v;}!1?-{x&Q
zxmwjua=)PEEiTWlFyZgnM~r^mk(0hL&$BR~qW9XITknqWPrleFv-w&>DLC!;Hi1*i
zi>A4tMAP0p4@9ZAEC5j_TNZG@O0da=twmrCIMcswE#m~qfOGQXthO=*5D%Uofe{f5
z#4xa=F_Z(C%Y(#$Sv0_#kx7IZQHFrB+~&-7Ww2xVI&wkw{_Q9PQ3ahvAnHkH35bg7
z0#g^d3P3!kZZL00cPWUc-%}2vRzN7lUa%<>dcmeJ_km3*?*nUi+gAei1t?cc&g_o?
zb3h4b^4b0bu$Lg|z-$792Z`1B6GWNn>wziDMh}Y@K#>&!^lJkU+rs<|q?a`EPga;1
Kz_t%0!2ke25oj6!

diff --git a/app/src/main/java/io/github/rosemoe/editor/widget/CodeEditor.java b/app/src/main/java/io/github/rosemoe/editor/widget/CodeEditor.java
index cfec39fe9..1ca5891b5 100755
--- a/app/src/main/java/io/github/rosemoe/editor/widget/CodeEditor.java
+++ b/app/src/main/java/io/github/rosemoe/editor/widget/CodeEditor.java
@@ -81,6 +81,7 @@ import com.itsaky.lsp.models.DocumentChangeEvent;
 import com.itsaky.lsp.models.DocumentCloseEvent;
 import com.itsaky.lsp.models.DocumentOpenEvent;
 import com.itsaky.lsp.models.DocumentSaveEvent;
+import com.itsaky.lsp.models.ExpandSelectionParams;
 import com.itsaky.lsp.models.Position;
 import com.itsaky.lsp.models.Range;
 import com.itsaky.lsp.models.ReferenceParams;
@@ -3528,6 +3529,17 @@ public class CodeEditor extends View implements ContentListener, TextAnalyzer.Ca
         setSelectionRegion (0, 0, getLineCount () - 1, getText ().getColumnCount (getLineCount () - 1));
     }
     
+    /**
+     * Set selection to the given range.
+     * @param range The range to select.
+     */
+    public void setSelection (Range range) {
+        setSelectionRegion (range.getStart ().getLine (),
+                range.getStart ().getColumn (),
+                range.getEnd ().getLine (),
+                range.getEnd ().getColumn ());
+    }
+    
     /**
      * Set selection region with a call to {@link CodeEditor#ensureSelectionVisible()}
      *
@@ -4634,6 +4646,36 @@ public class CodeEditor extends View implements ContentListener, TextAnalyzer.Ca
         )));
     }
     
+    public void expandSelection () {
+        if (mLanguageServer == null || getFile () == null) {
+            LOG.error ("Cannot expand selection. Language server or file is null");
+            return;
+        }
+        
+        final var pd = ProgressDialog.show (getContext (), null, getContext ().getString (R.string.please_wait), true, false);
+        final CompletableFuture<Range> future = CompletableFuture.supplyAsync (() ->
+                mLanguageServer.getSelectionProvider ()
+                    .expandSelection (
+                            new ExpandSelectionParams (
+                                    getFile ().toPath (),
+                                    getCursorRange ()
+                            )
+                    )
+        );
+        
+        future.whenComplete (((range, throwable) -> {
+            
+            pd.dismiss ();
+            
+            if (throwable != null) {
+                LOG.error ("Error computing expanded selection range", throwable);
+                return;
+            }
+            
+            setSelection (range);
+        }));
+    }
+    
     public Position getCursorAsLSPPosition () {
         return new Position (getCursor ().getLeftLine (), getCursor ().getLeftColumn ());
     }
diff --git a/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java b/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java
index 06de873cb..0eac82870 100755
--- a/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java
+++ b/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java
@@ -36,6 +36,7 @@ import androidx.core.content.ContextCompat;
 
 import com.blankj.utilcode.util.SizeUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.itsaky.androidide.R;
 import com.itsaky.androidide.app.StudioApp;
 import com.itsaky.androidide.utils.DialogUtils;
 import com.itsaky.lsp.models.CodeActionItem;
@@ -84,23 +85,27 @@ class EditorTextActionModeStarter implements CodeEditor.EditorTextActionPresente
                         android.R.attr.actionModePasteDrawable,
                     });
                     
+                    menu.add (0, 8, 0, R.string.action_expand_selection)
+                            .setShowAsActionFlags (1)
+                            .setIcon (createDrawable (R.drawable.ic_expand_selection));
+                    
                     menu.add(0, 0, 0, mEditor.getContext().getString(android.R.string.selectAll))
-                        .setShowAsActionFlags(2)
+                        .setShowAsActionFlags(1)
                         .setIcon(array.getDrawable(0));
 
                     if (mEditor.isEditable()) {
                         menu.add(0, 1, 0, mEditor.getContext().getString(android.R.string.cut))
-                            .setShowAsActionFlags(2)
+                            .setShowAsActionFlags(1)
                             .setIcon(array.getDrawable(1));
                     }
 
                     menu.add(0, 2, 0, mEditor.getContext().getString(android.R.string.copy))
-                        .setShowAsActionFlags(2)
+                        .setShowAsActionFlags(1)
                         .setIcon(array.getDrawable(2));
 
                     if (mEditor.isEditable()) {
                         menu.add(0, 3, 0, mEditor.getContext().getString(android.R.string.paste))
-                            .setShowAsActionFlags(2)
+                            .setShowAsActionFlags(1)
                             .setIcon(array.getDrawable(3));
                     }
     
@@ -191,18 +196,16 @@ class EditorTextActionModeStarter implements CodeEditor.EditorTextActionPresente
                             mEditor.uncommentLine();
                             break;
                         case 8 :
-                            if (fixes == null || fixes.isEmpty()) {
-                                StudioApp.getInstance().toast(com.itsaky.androidide.R.string.msg_no_code_actions, Toaster.Type.INFO);
-                                break;
-                            }
-                            showFixes();
+                            mEditor.expandSelection ();
                             break;
                     }
-
-                    if (menuItem.getItemId() != 0) {
-                        onExit();
+    
+                    final var id = menuItem.getItemId ();
+                    if (id == 0 || id == 8) {
+                        return true;
                     }
-                    return false;
+                    
+                    return onExit ();
                 }
 
                 @Override
@@ -211,77 +214,6 @@ class EditorTextActionModeStarter implements CodeEditor.EditorTextActionPresente
                     mActionMode = null;
                     mEditor.setSelection(mEditor.getCursor().getLeftLine(), mEditor.getCursor().getLeftColumn());
                 }
-
-                void showFixes() {
-                    final MaterialAlertDialogBuilder builder = DialogUtils.newMaterialDialogBuilder (mEditor.getContext ());
-                    builder.setTitle(com.itsaky.androidide.R.string.msg_code_actions);
-                    builder.setView(createFixesListView());
-                    builder.show();
-                }
-
-                ListView createFixesListView() {
-                    final ListView list = new ListView(mEditor.getContext());
-                    final QuickFixAdapter adapter = new QuickFixAdapter(fixes);
-                    list.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-                    list.setAdapter(adapter);
-                    list.setOnItemClickListener((a, b, c, d) -> performCodeAction(adapter.getItem(c)));
-                    return list;
-                }
-
-                class QuickFixAdapter extends BaseAdapter {
-
-                    private final List<CodeActionItem> actions;
-                    private final int dp16 = SizeUtils.dp2px(16);
-                    private final int dp4 = SizeUtils.dp2px(4);
-                    private final int dp48 = SizeUtils.dp2px(48);
-
-                    public QuickFixAdapter(List<CodeActionItem> actions) {
-                        this.actions = actions;
-                    }
-
-                    @Override
-                    public int getCount() {
-                        return actions.size();
-                    }
-
-                    @Override
-                    public CodeActionItem getItem(int position) {
-                        return actions.get(position);
-                    }
-
-                    @Override
-                    public long getItemId(int position) {
-                        return position;
-                    }
-
-                    @Override
-                    public View getView(int position, View convertView, ViewGroup parent) {
-                        if (convertView == null) {
-                            convertView = createItemTextView(position, parent);
-                        }
-                        return convertView;
-                    }
-
-                    private View createItemTextView(int position, ViewGroup parent) {
-                        final var action = getItem(position);
-                        final TextView text = new TextView(parent.getContext());
-                        final String title = action.getTitle();
-
-                        text.setText(title);
-                        text.setPaddingRelative(dp16, dp4, dp16, dp4);
-                        text.setMinHeight(dp48);
-                        text.setGravity(Gravity.CENTER_VERTICAL);
-
-                        return text;
-                    }
-                }
-
-                void performCodeAction(CodeActionItem action) {
-                    if (mEditor.getLanguageClient() != null) {
-                        mEditor.getLanguageClient().performCodeAction(mEditor, action);
-                    }
-                }
-
             });
     }
 
diff --git a/app/src/main/res/drawable/ic_expand_selection.xml b/app/src/main/res/drawable/ic_expand_selection.xml
new file mode 100644
index 000000000..b9091d8bd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_expand_selection.xml
@@ -0,0 +1,8 @@
+<!-- drawable/arrow_expand_all.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#ffffff" android:pathData="M9.5,13.09L10.91,14.5L6.41,19H10V21H3V14H5V17.59L9.5,13.09M10.91,9.5L9.5,10.91L5,6.41V10H3V3H10V5H6.41L10.91,9.5M14.5,13.09L19,17.59V14H21V21H14V19H17.59L13.09,14.5L14.5,13.09M13.09,9.5L17.59,5H14V3H21V10H19V6.41L14.5,10.91L13.09,9.5Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 77777f2ca..542c53ced 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -156,7 +156,7 @@
     <string name="template_navigation_drawer">Navigation drawer project</string>
     <string name="template_kotlin_basic">Kotlin Basic Project</string>
     <string name="template_description_kotlin_basic">Kotlin project with Appcompat Toolbar and a Floating Action Button</string>
-
+    
     <!-- Files -->
     <string name="save">Save</string>
     <string name="show_files">Files</string>
@@ -354,5 +354,6 @@
     <string name="msg_compiler_module_install">Compiler module is being installed, please wait&#8230;</string>
     <string name="msg_compiler_module_install_failed">Compiler module installation failed. The error was:\n%s</string>
     <string name="msg_compiler_module_installed">Compiler module installed successfully!</string>
-
+    <string name="action_expand_selection">Expand selection</string>
+    
 </resources>
diff --git a/lsp/api/src/main/java/com/itsaky/lsp/api/ILanguageServer.java b/lsp/api/src/main/java/com/itsaky/lsp/api/ILanguageServer.java
index 56952fee7..8c40b444f 100644
--- a/lsp/api/src/main/java/com/itsaky/lsp/api/ILanguageServer.java
+++ b/lsp/api/src/main/java/com/itsaky/lsp/api/ILanguageServer.java
@@ -131,6 +131,14 @@ public interface ILanguageServer {
     @NonNull
     IDefinitionProvider getDefinitionProvider();
     
+    /**
+     * Get the selection provider associated with this language server.
+     *
+     * @return The selection provider instance.
+     */
+    @NonNull
+    ISelectionProvider getSelectionProvider ();
+    
     /**
      * Get the signature help provider associated with this language server.
      * @return The signature help provider.
diff --git a/lsp/api/src/main/java/com/itsaky/lsp/api/ISelectionProvider.java b/lsp/api/src/main/java/com/itsaky/lsp/api/ISelectionProvider.java
new file mode 100644
index 000000000..714e6fead
--- /dev/null
+++ b/lsp/api/src/main/java/com/itsaky/lsp/api/ISelectionProvider.java
@@ -0,0 +1,44 @@
+/*
+ *  This file is part of AndroidIDE.
+ *
+ *  AndroidIDE is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AndroidIDE is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.itsaky.lsp.api;
+
+import androidx.annotation.NonNull;
+
+import com.itsaky.lsp.models.ExpandSelectionParams;
+import com.itsaky.lsp.models.Range;
+
+/**
+ * A selection provider provides features such as
+ * expanding the current selection.
+ *
+ * @author Akash Yadav
+ */
+public interface ISelectionProvider {
+    
+    /**
+     * Request sent by client for expanding the current selection.
+     * <p>
+     *     Example: If a statement in a method body is selected,
+     *     the provider returns the range of the method body as the expanded selection.
+     * </p>
+     *
+     * @param params The params for expanding the selection.
+     * @return The expanded selection range. Or same range as params if cannot be expanded.
+     */
+    Range expandSelection (@NonNull ExpandSelectionParams params);
+}
diff --git a/lsp/api/src/main/java/com/itsaky/lsp/api/IServerSettings.java b/lsp/api/src/main/java/com/itsaky/lsp/api/IServerSettings.java
index 1f72b4703..b0875cf46 100644
--- a/lsp/api/src/main/java/com/itsaky/lsp/api/IServerSettings.java
+++ b/lsp/api/src/main/java/com/itsaky/lsp/api/IServerSettings.java
@@ -41,6 +41,14 @@ public interface IServerSettings {
      */
     boolean codeActionsEnabled ();
     
+    /**
+     * Called by language server to check if
+     * smart selections are enabled or not.
+     *
+     * @return {@code true} if enabled, {@code false} otherwise.
+     */
+    boolean smartSelectionsEnabled ();
+    
     /**
      * Called by the language server to check if the signature
      * help is enabled.
diff --git a/lsp/api/src/main/java/com/itsaky/lsp/models/Locations.kt b/lsp/api/src/main/java/com/itsaky/lsp/models/Locations.kt
index e5dd274f1..cff0c6a32 100644
--- a/lsp/api/src/main/java/com/itsaky/lsp/models/Locations.kt
+++ b/lsp/api/src/main/java/com/itsaky/lsp/models/Locations.kt
@@ -142,7 +142,44 @@ open class Range(var start: Position, var end: Position) : Comparable<Range> {
         return start.line <= line && end.line >= line
     }
     
+    fun containsColumn (column: Int): Boolean {
+        return start.column <= column && end.column >= column
+    }
+    
+    fun containsRange (other: Range) : Boolean {
+        if (!containsLine(other.start.line) || !containsLine(other.end.line)) {
+            return false
+        }
+        
+        return containsColumn(other.start.column) && containsColumn(other.end.column);
+    }
+    
+    fun isSmallerThan (other: Range) : Boolean {
+        return other.isBiggerThan(this)
+    }
+    
+    fun isBiggerThan (other: Range) : Boolean {
+        
+        if (equals(other)) {
+            return false
+        }
+        
+        if (start.line < other.start.line && end.line > other.end.line) {
+            return true
+        }
+        
+        if (start.line == other.start.line && end.line == other.end.line) {
+            if (start.column <= other.start.column && end.column >= other.end.column) {
+                return true
+            }
+        }
+        
+        return false
+    }
+    
     override fun toString(): String {
         return "Range(start=$start, end=$end)"
     }
-}
\ No newline at end of file
+}
+
+data class ExpandSelectionParams (var file: Path, var selection: Range)
\ No newline at end of file
diff --git a/lsp/api/src/main/java/com/itsaky/lsp/util/DefaultServerSettings.kt b/lsp/api/src/main/java/com/itsaky/lsp/util/DefaultServerSettings.kt
index a01148563..872613a82 100644
--- a/lsp/api/src/main/java/com/itsaky/lsp/util/DefaultServerSettings.kt
+++ b/lsp/api/src/main/java/com/itsaky/lsp/util/DefaultServerSettings.kt
@@ -27,6 +27,7 @@ import com.itsaky.lsp.api.IServerSettings
 class DefaultServerSettings : IServerSettings {
     override fun completionsEnabled(): Boolean = true
     override fun codeActionsEnabled(): Boolean = true
+    override fun smartSelectionsEnabled(): Boolean = true
     override fun signatureHelpEnabled(): Boolean = true
     override fun referencesEnabled(): Boolean = true
     override fun definitionsEnabled(): Boolean = true
diff --git a/lsp/api/src/main/java/com/itsaky/lsp/util/NoSelectionProvider.kt b/lsp/api/src/main/java/com/itsaky/lsp/util/NoSelectionProvider.kt
new file mode 100644
index 000000000..9cee4a914
--- /dev/null
+++ b/lsp/api/src/main/java/com/itsaky/lsp/util/NoSelectionProvider.kt
@@ -0,0 +1,29 @@
+/*
+ *  This file is part of AndroidIDE.
+ *
+ *  AndroidIDE is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AndroidIDE is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.itsaky.lsp.util
+
+import com.itsaky.lsp.api.ISelectionProvider
+import com.itsaky.lsp.models.ExpandSelectionParams
+import com.itsaky.lsp.models.Range
+
+/**
+ * @author Akash Yadav
+ */
+class NoSelectionProvider : ISelectionProvider {
+    override fun expandSelection(params: ExpandSelectionParams): Range = params.selection;
+}
\ No newline at end of file
diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java b/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java
index bfe258f1f..3b0f7bb11 100644
--- a/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java
+++ b/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java
@@ -29,6 +29,7 @@ import com.itsaky.lsp.api.IDocumentHandler;
 import com.itsaky.lsp.api.ILanguageClient;
 import com.itsaky.lsp.api.ILanguageServer;
 import com.itsaky.lsp.api.IReferenceProvider;
+import com.itsaky.lsp.api.ISelectionProvider;
 import com.itsaky.lsp.api.IServerSettings;
 import com.itsaky.lsp.api.ISignatureHelpProvider;
 import com.itsaky.lsp.java.compiler.JavaCompilerService;
@@ -37,6 +38,7 @@ import com.itsaky.lsp.java.providers.CodeActionProvider;
 import com.itsaky.lsp.java.providers.CompletionProvider;
 import com.itsaky.lsp.java.providers.DefinitionProvider;
 import com.itsaky.lsp.java.providers.JavaCodeAnalyzer;
+import com.itsaky.lsp.java.providers.JavaSelectionProvider;
 import com.itsaky.lsp.java.providers.ReferenceProvider;
 import com.itsaky.lsp.java.providers.SignatureProvider;
 import com.itsaky.lsp.models.DocumentChangeEvent;
@@ -51,6 +53,7 @@ import com.itsaky.lsp.util.NoCodeAnalyzer;
 import com.itsaky.lsp.util.NoCompletionsProvider;
 import com.itsaky.lsp.util.NoDefinitionProvider;
 import com.itsaky.lsp.util.NoReferenceProvider;
+import com.itsaky.lsp.util.NoSelectionProvider;
 import com.itsaky.lsp.util.NoSignatureHelpProvider;
 
 import java.util.Collections;
@@ -208,6 +211,16 @@ public class JavaLanguageServer implements ILanguageServer, IDocumentHandler {
         return new DefinitionProvider (getCompiler ());
     }
     
+    @NonNull
+    @Override
+    public ISelectionProvider getSelectionProvider () {
+        if (!settings.smartSelectionsEnabled ()) {
+            return new NoSelectionProvider ();
+        }
+        
+        return new JavaSelectionProvider (getCompiler ());
+    }
+    
     @NonNull
     @Override
     public ISignatureHelpProvider getSignatureHelpProvider () {
diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java
new file mode 100644
index 000000000..1c627a3b2
--- /dev/null
+++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java
@@ -0,0 +1,67 @@
+/*
+ *  This file is part of AndroidIDE.
+ *
+ *  AndroidIDE is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AndroidIDE is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.itsaky.lsp.java.providers;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.itsaky.androidide.utils.Logger;
+import com.itsaky.lsp.api.ISelectionProvider;
+import com.itsaky.lsp.java.compiler.CompilerProvider;
+import com.itsaky.lsp.java.visitors.FindBiggerRange;
+import com.itsaky.lsp.models.ExpandSelectionParams;
+import com.itsaky.lsp.models.Position;
+import com.itsaky.lsp.models.Range;
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.LineMap;
+import com.sun.source.tree.Tree;
+import com.sun.source.util.SourcePositions;
+import com.sun.source.util.TreePath;
+import com.sun.source.util.Trees;
+
+/**
+ * Selection provider implementation for Java.
+ * @author Akash Yadav
+ */
+public class JavaSelectionProvider implements ISelectionProvider {
+    
+    private final CompilerProvider compiler;
+    
+    private static final Logger LOG = Logger.instance ("JavaSelectionProvider");
+    
+    public JavaSelectionProvider (CompilerProvider compiler) {
+        this.compiler = compiler;
+    }
+    
+    @Override
+    public Range expandSelection (@NonNull ExpandSelectionParams params) {
+        return compiler.compile (params.getFile ()).getWithTask (task -> {
+            final CompilationUnitTree root = task.root (params.getFile ());
+            final FindBiggerRange rangeFinder = new FindBiggerRange (task.task, root);
+            final Range range = rangeFinder.scan (root, params.getSelection ());
+            
+            if (range != null) {
+                LOG.debug ("Expanding selection to range", range);
+                return range;
+            }
+            
+            LOG.debug ("Unable to expand selection");
+            return params.getSelection ();
+        });
+    }
+}
diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java
new file mode 100644
index 000000000..000c73c1b
--- /dev/null
+++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java
@@ -0,0 +1,127 @@
+/*
+ *  This file is part of AndroidIDE.
+ *
+ *  AndroidIDE is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AndroidIDE is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.itsaky.lsp.java.visitors;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.itsaky.androidide.utils.Logger;
+import com.itsaky.lsp.models.Position;
+import com.itsaky.lsp.models.Range;
+import com.sun.source.tree.BlockTree;
+import com.sun.source.tree.CatchTree;
+import com.sun.source.tree.ClassTree;
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.LineMap;
+import com.sun.source.tree.MethodTree;
+import com.sun.source.tree.SynchronizedTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.tree.TryTree;
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.SourcePositions;
+import com.sun.source.util.TreeScanner;
+import com.sun.source.util.Trees;
+
+/**
+ * @author Akash Yadav
+ */
+public class FindBiggerRange extends TreeScanner<Range, Range> {
+    
+    private final SourcePositions positions;
+    private final CompilationUnitTree root;
+    private final LineMap lineMap;
+    
+    public FindBiggerRange (JavacTask task, @NonNull CompilationUnitTree root) {
+        this.positions = Trees.instance (task).getSourcePositions ();
+        this.root = root;
+        this.lineMap = root.getLineMap ();
+    }
+    
+    @Override
+    public Range scan (Tree tree, Range range) {
+        final Range smallerThanThis = super.scan (tree, range);
+        if (smallerThanThis != null) {
+            return smallerThanThis;
+        }
+        
+        final Range treeRange = getRange (tree);
+        if (treeRange != null && range.isSmallerThan (treeRange)) {
+            Logger.instance ("FindBiggerRange").debug ("Selecting tree", tree, tree.getClass (), tree.getKind ());
+            return treeRange;
+        }
+        
+        return null;
+    }
+    
+    @Override
+    public Range visitTry (TryTree node, Range range) {
+    
+        // If this try's body or finally block is selected, then select the entire try
+        final Range methodRange = getRange (node);
+        final Range blockRange = getRange (node.getBlock ());
+        final Range finallyRange = getRange (node.getFinallyBlock ());
+        if ((range.equals (blockRange) || range.equals (finallyRange)) && methodRange != null) {
+            return methodRange;
+        }
+        
+        return super.visitTry (node, range);
+    }
+    
+    @Override
+    public Range visitMethod (MethodTree node, Range range) {
+        
+        // If this methods body is selected, then select the entire method
+        final Range methodRange = getRange (node);
+        final Range blockRange = getRange (node.getBody ());
+        if (range.equals (blockRange) && methodRange != null) {
+            return methodRange;
+        }
+        
+        return super.visitMethod (node, range);
+    }
+    
+    @Override
+    public Range reduce (Range r1, Range r2) {
+        return r1 == null ? r2 : r1;
+    }
+    
+    @Nullable
+    private Range getRange (Tree leaf) {
+        final Range range = new Range ();
+        final Position start = new Position (0,0);
+        final Position end = new Position (0,0);
+        
+        final long startPos = positions.getStartPosition (root, leaf);
+        final long endPos = positions.getEndPosition (root, leaf);
+        
+        if (startPos == -1 || endPos == -1) {
+            return null;
+        }
+        
+        start.setLine ((int) lineMap.getLineNumber (startPos) - 1);
+        start.setColumn ((int) lineMap.getColumnNumber (startPos) - 1);
+        
+        end.setLine ((int) lineMap.getLineNumber (endPos) - 1);
+        end.setColumn ((int) lineMap.getColumnNumber (endPos) - 1);
+        
+        range.setStart (start);
+        range.setEnd (end);
+        
+        return range;
+    }
+}
diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindNameAt.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindNameAt.java
index e90aa11c7..2829f79d6 100644
--- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindNameAt.java
+++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindNameAt.java
@@ -25,6 +25,7 @@ import com.sun.source.util.*;
 import javax.lang.model.element.Name;
 
 public class FindNameAt extends TreePathScanner<TreePath, Long> {
+    
     private final JavacTask task;
     private CompilationUnitTree root;
     private ClassTree surroundingClass;