Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
{
"env": {
"browser": false,
"commonjs": true,
"es6": true,
"node": true
},
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"sourceType": "module"
},
"rules": {
"no-const-assign": "warn",
"no-this-before-super": "warn",
"no-undef": "warn",
"no-unreachable": "warn",
"no-unused-vars": "warn",
"constructor-super": "warn",
"valid-typeof": "warn"
}
}
"env": {
"browser": false,
"commonjs": true,
"es6": true,
"node": true,
"mocha": true
},
"parserOptions": {
"ecmaVersion": 2018,
"ecmaFeatures": {
"jsx": true
},
"sourceType": "module"
},
"rules": {
"no-const-assign": "warn",
"no-this-before-super": "warn",
"no-undef": "warn",
"no-unreachable": "warn",
"no-unused-vars": "warn",
"constructor-super": "warn",
"valid-typeof": "warn"
}
}
44 changes: 24 additions & 20 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
// A launch configuration that launches the extension inside a new window
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
{
"version": "0.1.0",
"configurations": [
{
"name": "Launch Extension",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
"stopOnEntry": false
},
{
"name": "Launch Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/test" ],
"stopOnEntry": false
}
]
}
"version": "0.2.0",
"configurations": [
{
"name": "Run Codealike Extension",
"type": "extensionHost",
"request": "launch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}"
]
},
{
"name": "Codealike Extension Tests",
"type": "extensionHost",
"request": "launch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/test/suite/index"
]
}
]
}
6 changes: 4 additions & 2 deletions .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
.vscode-test/**
test/**
.gitignore
jsconfig.json
.yarnrc
vsc-extension-quickstart.md
.eslintrc.json
**/jsconfig.json
**/*.map
**/.eslintrc.json
10 changes: 5 additions & 5 deletions extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function activate(context) {
statusBarItem.text = "Codealike is initializing...";

// initialize plugin for current client and version
Codealike.initialize('vscode', '0.0.24');
Codealike.initialize('vscode', '0.0.25');

Codealike.registerStateSubscriber((state) => {
if (state.isTracking) {
Expand Down Expand Up @@ -129,11 +129,11 @@ function startTrackingProject() {
}
);

vscode.debug.onDidStartDebugSession((event) => {
vscode.debug.onDidStartDebugSession(() => {
Codealike.trackDebuggingState();
});

vscode.debug.onDidTerminateDebugSession((event) => {
vscode.debug.onDidTerminateDebugSession(() => {
Codealike.trackCodingState();
});

Expand All @@ -150,7 +150,7 @@ function startTrackingProject() {
if (!event.contentChanges || event.contentChanges.length == 0)
return;

var line = event.contentChanges[0].range._start._line;
var line = event.contentChanges[0].range.start.line;
var className = null;
var member = null;

Expand Down Expand Up @@ -194,7 +194,7 @@ function startTrackingProject() {
if (!event.selections || event.selections.length == 0)
return;

var line = event.selections[0]._active._line;
var line = event.selections[0].active.line;
var className = null;
var member = null;

Expand Down
23 changes: 12 additions & 11 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"lib": [
"es6"
]
},
"exclude": [
"node_modules"
]
}
"compilerOptions": {
"module": "commonjs",
"target": "ES2020",
"checkJs": true, /* Typecheck .js files. */
"lib": [
"ES2020"
]
},
"exclude": [
"node_modules"
]
}
Loading