Optimizations and bug fixes

Author: FDiskas

README.md

@@ -1,3 +1,5 @@
 # react-toolkit
 
 Refactor React Native source code extracting inline styles from the VSCode menu
+
+![demo](assets/demo.gif)

assets/demo.gif

@@ -58,7 +58,6 @@
   },
   "devDependencies": {
     "@types/glob": "^7.1.1",
-    "@types/line-column": "^1.0.0",
     "@types/mocha": "^7.0.1",
     "@types/node": "^12.11.7",
     "@types/vscode": "^1.42.0",
@@ -70,7 +69,5 @@
     "typescript": "^3.7.5",
     "vscode-test": "^1.3.0"
   },
-  "dependencies": {
-    "line-column": "^1.0.2"
-  }
+  "dependencies": {}
 }

package.json

@@ -1,5 +1,4 @@
 import * as vscode from 'vscode';
-import lineColumn from 'line-column';
 import { editorContext, showInputBox, camelCase } from './utils';
 
 const { Position } = vscode;
@@ -19,18 +18,19 @@ export async function extractStyle() {
             .edit((edit) => {
                 const defaultLine = editor.document.lineCount + 1;
                 let stylesText;
-                let row = undefined;
+                let row = null;
 
                 if (text && !!~text.indexOf('StyleSheet.create')) {
-                    row = lineColumn(text).fromIndex(text.indexOf('StyleSheet.create'));
+                    editor.document.getText(selection);
+                    row = editor.document.positionAt(text.indexOf('StyleSheet.create')).line;
                     stylesText = `${styleName}: ${selectedText},\n`;
                 } else {
-                    stylesText = `\n\nconst styles = StyleSheet.create({\n${styleName}: ${selectedText},\n})`;
+                    stylesText = `\nconst styles = StyleSheet.create({\n${styleName}: ${selectedText},\n});`;
                 }
 
                 edit.replace(selection, `styles.${styleName}`);
 
-                edit.insert(new Position(row ? row.line : defaultLine, 0), stylesText);
+                edit.insert(new Position(row ? row + 1 : defaultLine, 0), stylesText);
             })
             .then(() => {
                 return vscode.commands.executeCommand('editor.action.formatDocument');

src/commands.ts

@@ -42,11 +42,6 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
   integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
 
-"@types/line-column@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/line-column/-/line-column-1.0.0.tgz#fa5a59c21e885fef3739a273b43dacf55b63437f"
-  integrity sha512-wbw+IDRw/xY/RGy+BL6f4Eey4jsUgHQrMuA4Qj0CSG3x/7C2Oc57pmRoM2z3M4DkylWRz+G1pfX06sCXQm0J+w==
-
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -822,23 +817,11 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.1"
 
-isarray@1.0.0, isarray@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -870,14 +853,6 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-line-column@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
-  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
-  dependencies:
-    isarray "^1.0.0"
-    isobject "^2.0.0"
-
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"