Skip to content

Commit ec70024

Browse files
authored
feat: Enable smart-tab command in web extension (#2560)
1 parent 342a06b commit ec70024

24 files changed

+400
-441
lines changed

.github/workflows/build.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,6 @@ jobs:
334334
- name: Deploy server jar
335335
working-directory: clients/cobol-lsp-vscode-extension
336336
run: cp ../../jar/server.jar ./server/jar
337-
- name: Setup telemetry key
338-
working-directory: clients/cobol-lsp-vscode-extension
339-
if: github.event.inputs.with_telemetry == 'true'
340-
run: echo ${{ secrets.TELEMETRY_INSTRUMENTATION_KEY }} > resources/TELEMETRY_KEY
341337
- name: Deploy windows executable
342338
working-directory: clients/cobol-lsp-vscode-extension
343339
if: startsWith( matrix.os, 'windows')
@@ -374,6 +370,12 @@ jobs:
374370
- name: Build COBOL LS extension
375371
run: npm ci
376372
working-directory: clients/cobol-lsp-vscode-extension
373+
- name: Inject telemetry key to COBOL LS extension
374+
if: github.event.inputs.with_telemetry == 'true'
375+
shell: bash
376+
run: |
377+
sed -i ${{ startsWith( matrix.os, 'macos') && '""' || '' }} "s/const TELEMETRY_KEY_ENCODED: string = TELEMETRY_DEFAULT_CONTENT/const TELEMETRY_KEY_ENCODED: string = '${{ secrets.TELEMETRY_INSTRUMENTATION_KEY }}'/" src/services/reporter/TelemetryReporterImpl.ts
378+
working-directory: clients/cobol-lsp-vscode-extension
377379
- name: Package COBOL LS vsix for ${{ env.target }}
378380
working-directory: clients/cobol-lsp-vscode-extension
379381
run: |

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ jobs:
4747
run: export NODE_PATH=`npm root -g`; release-it --ci --config ../../release/release-it-release.json
4848
env:
4949
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50-
THE_KEY: ${{ secrets.TELEMETRY_INSTRUMENTATION_KEY }}
50+
THE_KEY: ${{ secrets.TELEMETRY_INSTRUMENTATION_KEY }}

Jenkinsfile

-256
This file was deleted.

clients/cobol-lsp-vscode-extension/resources/TELEMETRY_KEY

-1
This file was deleted.

clients/cobol-lsp-vscode-extension/src/__tests__/commands/SmartTabCommandTest.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import * as vscode from "../../__mocks__/vscode";
1616
import * as smartTab from "../../commands/SmartTabCommand";
1717
import { initSmartTab } from "../../commands/SmartTabCommand";
18-
import { TabRule, TabSettings } from "../../services/Settings";
18+
import { TabRule, TabSettings } from "../../services/SmartTabSettings";
1919
import { Position, Selection, TextEditor } from "vscode";
2020

2121
const context: any = {

0 commit comments

Comments
 (0)