Skip to content
Open
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
8 changes: 4 additions & 4 deletions extension/client/src/language/serverReferences.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ConnectionConfig, IBMiMember } from "@halcyontech/vscode-ibmi-types";
import IBMi from "@halcyontech/vscode-ibmi-types/api/IBMi";
import { commands, Definition, DocumentSymbol, languages, Location, ProgressLocation, Range, SymbolInformation, SymbolKind, TextDocument, Uri, window, workspace } from "vscode";
import { getInstance } from "../base";
import IBMi from "@halcyontech/vscode-ibmi-types/api/IBMi";
import { ConnectionConfig, IBMiMember } from "@halcyontech/vscode-ibmi-types";

export function getServerSymbolProvider() {
let latestFetch: ExportInfo[]|undefined;
Expand All @@ -18,7 +18,7 @@ export function getServerSymbolProvider() {

if (instance && instance.getConnection()) {
const connection = instance.getConnection();
const config = connection.config! //TODO in vscode-ibmi 3.0.0 - change to getConfig()
const config = connection.getConfig();

let member: IBMiMember|undefined;

Expand Down Expand Up @@ -71,7 +71,7 @@ export function getServerImplementationProvider() {

if (connection) {
const word = document.getText(document.getWordRangeAtPosition(position));
const config = connection.getConfig() //TODO in vscode-ibmi 3.0.0 - change to getConfig()
const config = connection.getConfig();

const uriPath = document.uri.path;
const member = connection.parserMemberPath(uriPath);
Expand Down
10 changes: 5 additions & 5 deletions extension/client/src/linter.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import path = require('path');
import { commands, ExtensionContext, Uri, ViewColumn, window, workspace } from 'vscode';
import {getInstance} from './base';
import { getInstance } from './base';

import {DEFAULT_SCHEMA} from "./schemas/linter"
import { DEFAULT_SCHEMA } from "./schemas/linter";

export function initialise(context: ExtensionContext) {
context.subscriptions.push(
Expand Down Expand Up @@ -47,7 +47,7 @@ export function initialise(context: ExtensionContext) {

} else if (instance && instance.getConnection()) {
const connection = instance.getConnection();
const content = instance.getContent();
const content = connection.getContent();

/** @type {"member"|"streamfile"} */
let type = `member`;
Expand Down Expand Up @@ -142,7 +142,7 @@ export function initialise(context: ExtensionContext) {
try {
console.log(`Member path: ${[memberPath[0], `VSCODE`, `RPGLINT`].join(`/`)}`);

await content.uploadMemberContent(undefined, memberPath[0], `VSCODE`, `RPGLINT`, jsonString);
await content.uploadMemberContent(memberPath[0], `VSCODE`, `RPGLINT`, jsonString);
await commands.executeCommand(`code-for-ibmi.openEditable`, configPath);
} catch (e) {
console.log(e);
Expand All @@ -155,7 +155,7 @@ export function initialise(context: ExtensionContext) {
console.log(`IFS path: ${configPath}`);

try {
await content.writeStreamfile(configPath, jsonString);
await content.writeStreamfileRaw(configPath, jsonString, "utf-8");
await commands.executeCommand(`code-for-ibmi.openEditable`, configPath);
} catch (e) {
console.log(e);
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
"cli:dev:rpglint": "cd cli/rpglint && npm run webpack:dev"
},
"devDependencies": {
"@halcyontech/vscode-ibmi-types": "^2.11.0",
"@halcyontech/vscode-ibmi-types": "^3.0.10",
"@types/node": "^20.19.41",
"@typescript-eslint/eslint-plugin": "^5.30.0",
"@typescript-eslint/parser": "^5.30.0",
Expand Down
Loading