Use a tagged template string

Author: felixfbecker

src/test/util-test.ts

@@ -1,7 +1,14 @@
 import * as assert from 'assert';
-import { getMatchScore, isGlobalTSFile, isSymbolDescriptorMatch } from '../util';
+import { getMatchScore, isGlobalTSFile, isSymbolDescriptorMatch, JSONPTR } from '../util';
 
 describe('util', () => {
+	describe('JSONPTR', () => {
+		it('should escape JSON Pointer components', () => {
+			const uri = 'file:///foo/~bar';
+			const pointer = JSONPTR`/changes/${uri}/-`;
+			assert.equal(pointer, '/changes/file:~1~1~1foo~1~0bar/-');
+		});
+	});
 	describe('getMatchScore()', () => {
 		it('should return a score of 4 if 4 properties match', () => {
 			const score = getMatchScore({

src/typescript-service.ts

@@ -49,10 +49,10 @@ import {
 import {
 	convertStringtoSymbolKind,
 	defInfoToSymbolDescriptor,
-	encodeJsonPointerComponent,
 	getMatchScore,
 	isLocalUri,
 	isSymbolDescriptorMatch,
+	JSONPTR,
 	normalizeUri,
 	path2uri,
 	toUnixPath,
@@ -1037,10 +1037,10 @@ export class TypeScriptService {
 				// if file has no edit yet, initialize array
 				if (!editUris.has(uri)) {
 					editUris.add(uri);
-					return { op: 'add', path: `/changes/${encodeJsonPointerComponent(uri)}`, value: [edit] };
+					return { op: 'add', path: JSONPTR`/changes/${uri}`, value: [edit] };
 				}
 				// else append to array
-				return { op: 'add', path: `/changes/${encodeJsonPointerComponent(uri)}/-`, value: edit };
+				return { op: 'add', path: JSONPTR`/changes/${uri}/-`, value: edit };
 			})
 			.startWith({ op: 'add', path: '', value: { changes: {} } as WorkspaceEdit } as AddPatch);
 	}

src/util.ts

@@ -8,10 +8,10 @@ import { PackageDescriptor, SymbolDescriptor } from './request-type';
 let strict = false;
 
 /**
- * Encodes a JSON Pointer Component as per https://tools.ietf.org/html/rfc6901#section-3
+ * Template string tag to escape JSON Pointer components as per https://tools.ietf.org/html/rfc6901#section-3
  */
-export function encodeJsonPointerComponent(component: string): string {
-	return component.replace(/~/g, '~0').replace(/\//g, '~1');
+export function JSONPTR(strings: TemplateStringsArray, ...toEscape: string[]): string {
+	return strings.reduce((prev, curr, i) => prev + toEscape[i - 1].replace(/~/g, '~0').replace(/\//g, '~1') + curr);
 }
 
 /**